Prevent object loss and positioning outside the region with failed object sim

crossings
Merge branch 'master' into careminster
2012-02-14 00:02:53 +01:00 · 2012-02-10 23:59:10 +00:00 · 2012-02-10 23:58:39 +00:00 · 2012-02-10 23:52:06 +00:00 · 2012-02-10 23:41:14 +00:00 · 2012-02-10 23:39:59 +00:00
1236 changed files with 134194 additions and 129869 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -73,4 +73,20 @@ TAGS
 Makefile.local
 bin/.version
 compile.bat
-
+addon-modules
+OpenSim/Data/Tests/test-results/
+OpenSim/Framework/Serialization/Tests/test-results/
+OpenSim/Framework/Servers/Tests/test-results/
+OpenSim/Framework/Tests/test-results/
+OpenSim/Region/ClientStack/Linden/Caps/test-results/
+OpenSim/Region/ClientStack/Linden/UDP/Tests/test-results/
+OpenSim/Region/CoreModules/test-results/
+OpenSim/Region/Framework/test-results/
+OpenSim/Region/OptionalModules/test-results/
+OpenSim/Region/Physics/BulletDotNETPlugin/
+OpenSim/Region/Physics/Manager/test-results/
+OpenSim/Region/Physics/OdePlugin/Tests/test-results/
+OpenSim/Region/ScriptEngine/test-results/
+OpenSim/Tests/Common/test-results/
+OpenSim/Tests/test-results/
+test-results/
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -8,6 +8,7 @@
 <target name="distbin">
  <copy file="bin/OpenSim.ini.example" tofile="bin/OpenSim.ini"/>
  <copy file="bin/config-include/StandaloneCommon.ini.example" tofile="bin/config-include/StandaloneCommon.ini"/>
+  <copy file="bin/config-include/FlotsamCache.ini.example" tofile="bin/config-include/FlotsamCache.ini"/>
  <delete dir="${distbindir}"/>
  <copy todir="${distbindir}">
    <fileset>
@@ -37,52 +38,8 @@
      <include name=".hgignore"/>
    </fileset>
  </delete>
-  
 </target>

-<!-- I don't think these targets are being actively used.  But just in case, we'll just comment them out for now - justincc -->
-<!--
-<property name="projectdir" value="opensim-0.6.9" />
-<target name="dist" depends="distdir">
-    <zip zipfile="${projectdir}.zip">
-    <fileset basedir=".">
-        <include name="${projectdir}/**" />
-    </fileset>
-    </zip>
-    <tar destfile="${projectdir}.tar.gz" compression="GZip">
-    <fileset basedir=".">
-        <include name="${projectdir}/**" />
-    </fileset>
-    </tar>
-</target>
-
-<target name="distdir">
-   <delete dir="${projectdir}" />
-   <copy todir="${projectdir}">
-       <fileset basedir=".">
-          <include name="ThirdPartyLicenses/**" />
-          <include name="CONTRIBUTORS.txt" />
-          <include name="README" />
-          <include name="OpenSim/**/*.cs" />
-          <include name="**/*.build" />
-          <include name="**/*.csproj" />
-          <include name="**/*.csproj.user" />
-          <include name="**/*.sln" />
-          <include name="bin/*.dll" />
-          <include name="bin/*.so" />
-          <include name="bin/*.config" />
-          <include name="bin/assets/**" />
-          <include name="bin/data/**" />
-          <include name="bin/OpenSim*xml" />
-          <include name="bin/OpenSim.ini" />
-          <include name="bin/defaultstripe.png" />
-          <exclude name="bin/OpenSim.*dll" />
-       </fileset>
-   </copy>
-   <touch file="${projectdir}/bin/startup_commands.txt" />
-</target>
-->
-
 <target name="test" depends="build, find-nunit">
  <setenv name="MONO_THREADS_PER_CPU" value="100" />

@@ -91,6 +48,11 @@
  the assembly here as an exec, and you add the fail clause later.
  This lets all the unit tests run and tells you if they fail at the
  end, instead of stopping short -->
+  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests">
+    <arg value="./bin/OpenSim.Tests.dll" />
+  </exec>
+  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests)==0}" /> 
+
  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.framework.tests">
    <arg value="./bin/OpenSim.Framework.Tests.dll" />
  </exec>
@@ -106,12 +68,15 @@
  </exec>
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.serialization.tests)==0}" /> 

-<!--
+  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.clientstack.lindencaps.tests">
+    <arg value="./bin/OpenSim.Region.ClientStack.LindenCaps.Tests.dll" />
+  </exec>
+  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.clientstack.lindencaps.tests)==0}" /> 
+
  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.clientstack.lindenudp.tests">
    <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
  </exec>
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.clientstack.lindenudp.tests)==0}" /> 
-->

  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.scriptengine.tests">
    <arg value="./bin/OpenSim.Region.ScriptEngine.Tests.dll" />
@@ -123,6 +88,11 @@
  </exec>
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.coremodules.tests)==0}" /> 

+  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.optionalmodules.tests">
+    <arg value="./bin/OpenSim.Region.OptionalModules.Tests.dll" />
+  </exec>
+  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.optionalmodules.tests)==0}" /> 
+
  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.framework.tests">
    <arg value="./bin/OpenSim.Region.Framework.Tests.dll" />
  </exec>
@@ -133,106 +103,23 @@
  </exec>
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> 

-  <delete dir="%temp%"/>
+  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.capabilities.handlers.tests">
+    <arg value="./bin/OpenSim.Capabilities.Handlers.Tests.dll" />
+  </exec>
+  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> 

+  <delete dir="%temp%"/>
 </target>

-<target name="test-cov" depends="build">
-    <!-- Code Coverage Test. Prototype, only works with mono 1.2. Instructions in http://opensimulator.org/wiki/Automated_Testing -->
-    <mkdir dir="cov" failonerror="false" />
-    <exec program="mono">
-      <arg value="--debug" />
-      <arg value="--profile=monocov:outfile=./cov/OpenSim.Framework.Servers.cov,+[OpenSim.Framework.Servers]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-      <arg value="./bin/OpenSim.Framework.Servers.Tests.dll" />
-    </exec>
-    <delete dir="./cov/OpenSim.Framework.Servers" />
-    <exec program="monocov">
-      <arg value="--export-html=./cov/OpenSim.Framework.Servers ./cov/OpenSim.Framework.Servers.cov" />
-    </exec>
+<target name="torture" depends="build, find-nunit">
+  <setenv name="MONO_THREADS_PER_CPU" value="100" />

-<!--
-    <exec program="mono">
-      <arg value="&#45;&#45;debug" />
-      <arg value="&#45;&#45;profile=monocov:outfile=./cov/OpenSim.Region.ClientStack.LindenUDP.cov,+[OpenSim.Region.ClientStack.LindenUDP]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-     <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
-    </exec>
-    <delete dir="./cov/OpenSim.Region.ClientStack.LindenUDP" />
-    <exec program="monocov">
-      <arg value="&#45;&#45;export-html=./cov/OpenSim.Region.ClientStack.LindenUDP ./cov/OpenSim.Region.ClientStack.LindenUDP.cov" />
-    </exec>
-->
-    
-    <exec program="mono">
-      <arg value="--debug" />
-      <arg value="--profile=monocov:outfile=./cov/OpenSim.Region.ScriptEngine.Shared.cov,+[OpenSim.Region.ScriptEngine.Shared]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-      <arg value="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
-    </exec>
-    <delete dir="./cov/OpenSim.Region.ScriptEngine.Shared" />
-    <exec program="monocov">      
-      <arg value="--export-html=./cov/OpenSim.Region.ScriptEngine.Shared ./cov/OpenSim.Region.ScriptEngine.Shared.cov" />
-    </exec>    
-    
-    <exec program="mono">
-      <arg value="--debug" />
-      <arg value="--profile=monocov:outfile=./cov/OpenSim.Region.ScriptEngine.Shared.CodeTools.cov,+[OpenSim.Region.ScriptEngine.Shared.CodeTools]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-      <arg value="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
-    </exec>
-    <delete dir="./cov/OpenSim.Region.ScriptEngine.Shared.CodeTools" />
-    <exec program="monocov">
-      <arg value="--export-html=./cov/OpenSim.Region.ScriptEngine.Shared.CodeTools ./cov/OpenSim.Region.ScriptEngine.Shared.CodeTools.cov" />
-    </exec>    
-    
-    <exec program="mono">
-      <arg value="--debug" />
-      <arg value="--profile=monocov:outfile=./cov/OpenSim.Region.CoreModules.cov,+[OpenSim.Region.CoreModules]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-      <arg value="./bin/OpenSim.Region.CoreModules.Tests.dll" />
-    </exec>
-    <delete dir="./cov/OpenSim.Region.CoreModules" />
-    <exec program="monocov">
-      <arg value="--export-html=./cov/OpenSim.Region.CoreModules ./cov/OpenSim.Region.CoreModules.cov" />
-    </exec>    
-
-    <exec program="mono">
-      <arg value="--debug" />
-      <arg value="--profile=monocov:outfile=./cov/OpenSim.Region.Framework.cov,+[OpenSim.Region.Framework]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-      <arg value="./bin/OpenSim.Region.Framework.Tests.dll" />
-    </exec>
-    <delete dir="./cov/OpenSim.Region.Framework" />
-    <exec program="monocov">
-      <arg value="--export-html=./cov/OpenSim.Region.Framework ./cov/OpenSim.Region.Framework.cov" />
-    </exec>    
-    
-    <exec program="mono">
-      <arg value="--debug" />
-      <arg value="--profile=monocov:outfile=./cov/OpenSim.Data.SQLite.cov,+[OpenSim.Data.SQLite]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-      <arg value="./bin/OpenSim.Data.SQLite.Tests.dll" />
-    </exec>
-    <delete dir="./cov/OpenSim.Data.SQLite" />
-    <exec program="monocov">
-      <arg value="--export-html=./cov/OpenSim.Data.SQLite ./cov/OpenSim.Data.SQLite.cov" />
-    </exec>    
-    
-    <exec program="mono">
-      <arg value="--debug" />
-      <arg value="--profile=monocov:outfile=./cov/OpenSim.Data.MySQL.cov,+[OpenSim.Data.MySQL.Tests]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-      <arg value="./bin/OpenSim.Data.MySQL.Tests.dll" />
-    </exec>  
-    <delete dir="./cov/OpenSim.Data.MySQL" />
-    <exec program="monocov">
-      <arg value="--export-html=./cov/OpenSim.Data.MySQL ./cov/OpenSim.Data.MySQL.cov" />
-    </exec>     
-
-    <delete file="C:\NUnitPrimaryTrace.txt" failonerror="false" />
-    <delete file="TestResult.xml" failonerror="false" />
+  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.torture">
+    <arg value="./bin/OpenSim.Tests.Torture.dll" />
+  </exec>

+  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.torture)==0}" /> 
+  <delete dir="%temp%"/>
 </target>

 <target name="find-nunit">
@@ -245,17 +132,19 @@
    if="${int::parse(hasnunit2)==0}" />
  <property name="nunitcmd" value="nunit-console"
    if="${int::parse(hasnunit2)==1}" />
-
 </target>

 <!-- this is used for panda test execution -->
 <!-- work in progress -->

 <target name="test-xml" depends="build, find-nunit">
-  
-
  <mkdir dir="test-results" failonerror="false" />
  <!-- Unit Test Assembly -->
+  <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.tests">
+    <arg value="./bin/OpenSim.Tests.dll" />
+    <arg value="-xml=test-results/OpenSim.Tests.dll-Results.xml" />
+  </exec>
+
  <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.tests">
    <arg value="./bin/OpenSim.Framework.Tests.dll" />
    <arg value="-xml=test-results/OpenSim.Framework.Tests.dll-Results.xml" />
@@ -271,12 +160,15 @@
    <arg value="-xml=test-results/OpenSim.Framework.Servers.Tests.dll-Results.xml" />
  </exec>

-<!--
+ <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.clientstack.lindencaps.tests">
+    <arg value="./bin/OpenSim.Region.ClientStack.LindenCaps.Tests.dll" />
+    <arg value="-xml=test-results/OpenSim.Region.ClientStack.LindenCaps.Tests.dll-Results.xml" />
+  </exec>
+
 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.clientstack.lindenudp.tests">
    <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
    <arg value="-xml=test-results/OpenSim.Region.ClientStack.LindenUDP.Tests.dll-Results.xml" />
  </exec>
-->

 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.scriptengine.tests">
    <arg value="./bin/OpenSim.Region.ScriptEngine.Tests.dll" />
@@ -288,6 +180,11 @@
    <arg value="-xml=test-results/OpenSim.Region.CoreModules.Tests.dll-Results.xml" />
  </exec>

+ <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.optionalmodules.tests">
+    <arg value="./bin/OpenSim.Region.OptionalModules.Tests.dll" />
+    <arg value="-xml=test-results/OpenSim.Region.OptionalModules.Tests.dll-Results.xml" />
+  </exec>
+
 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.framework.tests">
    <arg value="./bin/OpenSim.Region.Framework.Tests.dll" />
    <arg value="-xml=test-results/OpenSim.Region.Framework.Tests.dll-Results.xml" />
@@ -298,42 +195,22 @@
    <arg value="-xml=test-results/OpenSim.Data.Tests.dll-Results.xml" />
  </exec>

+ <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.capabilities.handlers.tests">
+    <arg value="./bin/OpenSim.Capabilities.Handlers.Tests.dll" />
+    <arg value="-xml=test-results/OpenSim.Capabilities.Handlers.Tests.dll-Results.xml" />
+  </exec>
+
+ <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests)==0}" /> 
 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> 
 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" /> 
-<!-- <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.clientstack.lindenudp.tests)==0}" /> -->
+ <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.clientstack.lindenudp.tests)==0}" />
 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.scriptengine.tests)==0}" /> 
 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.coremodules.tests)==0}" /> 
+ <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.optionalmodules.tests)==0}" /> 
 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" /> 
 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> 
-
+ <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> 
 </target>
-<!--     <exec program="nunit-console.exe" failonerror="false" resultproperty="testresult.acceptancetestassembly"> -->
-<!--         <arg value="AcceptanceTestAssembly.dll" /> -->
-<!--         <arg value="/xml=AcceptanceTestAssembly-Results.xml" /> -->
-<!--     </exec> -->
-
-<!--     <fail message="Failures reported in unit tests." unless="${int::parse(testresult.unittestassembly)==0}" /> -->
-<!--     <fail message="Failures reported in acceptance tests." unless="${int::parse(testresult.acceptancetestassembly)==0}" /> -->
-<!-- </target> -->
-
-
-
-<!--       <nunit2 failonerror="true" verbose="true"> -->
-<!--       <formatter type="Xml" usefile="true" extension=".xml" outputdir="./test-results" /> -->
-<!--       <test> -->
-<!--         <assemblies> -->
-<!--           <include name="./bin/OpenSim.Framework.Tests.dll" /> -->
-<!--           <include name="./bin/OpenSim.Framework.Servers.Tests.dll" /> -->
-<!--           <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> -->
-<!--           <include name="./bin/OpenSim.Region.ScriptEngine.Tests.dll" /> -->
-<!--           <include name="./bin/OpenSim.Region.CoreModules.Tests.dll" /> -->
-<!--           <include name="./bin/OpenSim.Region.Framework.Tests.dll" /> -->
-<!--           <include name="./bin/OpenSim.Data.SQLite.Tests.dll" /> -->
-<!--           <include name="./bin/OpenSim.Data.MySQL.Tests.dll" /> -->
-<!--         </assemblies> -->
-<!--       </test> -->
-<!--     </nunit2> -->
-<!-- </target> -->

 <target name="doxygen">
  <exec program="doxygen" workingdir="doc" commandline="doxygen.conf" />
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -1,4 +1,4 @@
-=== Building OpenSim ===
+==== Building OpenSim ====

 === Building on Windows ===

@@ -12,18 +12,27 @@ Steps:
 === Building on Linux ===

 Prereqs:
- * Mono >= 2.4.2
+ * Mono >= 2.4.3
 * Nant >= 0.85
 * On some Linux distributions you may need to install additional packages.  
    See http://opensimulator.org/wiki/Dependencies for more information.

+ * May also use xbuild (included in mono distributions)
+ * May use Monodevelop, a cross-platform IDE 
+
 From the distribution type:
 * ./runprebuild.sh
- * nant
+ * nant (or xbuild)
 * cd bin 
 * copy OpenSim.ini.example to OpenSim.ini and other appropriate files in bin/config-include
 * run mono OpenSim.exe

+=== Using Monodevelop ===
+
+From the distribution type:
+ * ./runprebuild.sh
+ * type monodevelop OpenSim.sln
+
 === References ===
 
 Helpful resources:
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -1,34 +1,39 @@
 The following people have contributed to OpenSim (Thank you 
 for your effort!)

-Add your name in here if you have committed to OpenSim
-
 = Current OpenSim Developers (in very rough order of appearance) =
 These folks represent the current core team for OpenSim, and are the
 people that make the day to day of OpenSim happen.

+* justincc (OSVW Consulting, justincc.org)
+* chi11ken (Genkii)
+* dahlia
+* Melanie Thielker
+* Diva (Crista Lopes, University of California, Irvine)
+* Dan Lake (Intel)
+* Marck
+* Mic Bowman (Intel)
+* BlueWall (James Hughes)
+* Nebadon Izumi (Michael Cerquoni, OSgrid)
+* Snoopy Pfeffer
+* Richard Adams (Intel)
+
+= Core Developers Following the White Rabbit =
+Core developers who have temporarily (we hope) gone chasing the white rabbit. 
+They are in all similar to the active core developers, except that they haven't
+been that active lately, so their voting rights are awaiting their come back. 
+
 * MW (Tribal Media AB)
 * Adam Frisby 	(DeepThink Pty Ltd)
-* MingChen 	(DeepThink Pty Ltd)
 * lbsa71 (Tribal Media AB)
-* Sean Dague / sdague (IBM)
-* Tedd
-* justincc
 * Teravus (w3z)
-* Johan Berntsson (3Di)
 * Ckrinke (Charles Krinke)
-* chi11ken (Genkii)
-* adjohn (Genkii)
 * Dr Scofield aka Dirk Husemann (IBM Research - Zurich)
-* dahlia
 * mikem (3Di)
-* Melanie Thielker
 * Homer_Horwitz
-* idb (Ian Brown)
-* Diva (Crista Lopes, University of California, Irvine)
 * nlin (3Di)
 * Arthur Rodrigo S Valadares (IBM)
-
+* John Hurliman

 = Past Open Sim Developers =
 These folks are alumns of the OpenSim core group, but are now
@@ -44,6 +49,12 @@ where we are today.
 * Dalien
 * Darok
 * Alondria
+* Sean Dague / sdague (IBM)
+* Tedd
+* MingChen 	(DeepThink Pty Ltd)
+* adjohn (Genkii)
+* idb (Ian Brown)
+* Johan Berntsson (3Di)


 = Additional OpenSim Contributors =
@@ -69,9 +80,11 @@ what it is today.
 * dmiles (Daxtron Labs)
 * dslake (Intel)
 * FredoChaplin
+* Garmin Kawaguichi
 * Gerhard
 * Godfrey
 * Grumly57
+* GuduleLapointe
 * Ewe Loon
 * Fly-Man
 * Flyte Xevious
@@ -92,6 +105,7 @@ what it is today.
 * lulurun 
 * M.Igarashi
 * maimedleech
+* Mana Janus
 * Mic Bowman
 * Michelle Argus
 * Michael Cortez (The Flotsam Project, http://osflotsam.org/)
@@ -102,10 +116,15 @@ what it is today.
 * Misterblue (Intel)
 * Mircea Kitsune
 * mpallari
+* MrMonkE
+* Nebadon Izumi (Michael Cerquoni - http://OSgrid.org)
+* Neil Canham
 * nornalbion
 * Omar Vera Ustariz (IBM)
 * openlifegrid.com
+* Oren Hurvitz (Kitely)
 * otakup0pe
+* Pixel Tomsen
 * ralphos
 * RemedyTomm
 * Revolution
@@ -117,7 +136,8 @@ what it is today.
 * SachaMagne
 * Salahzar Stenvaag
 * sempuki
-* Snoopy
+* SignpostMarv
+* SpotOn3D
 * Strawberry Fride
 * tglion
 * tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud)
@@ -167,6 +187,7 @@ This software uses components from the following developers:
 * GlynnTucker.Cache (http://gtcache.sourceforge.net/)
 * NDesk.Options 0.2.1 (http://www.ndesk.org/Options)
 * Json.NET 3.5 Release 6.  The binary used is actually Newtonsoft.Json.Net20.dll for Mono 2.4 compatability (http://james.newtonking.com/projects/json-net.aspx)
+* zlib.net for C# 1.0.4 (http://www.componentace.com/zlib_.NET.htm)

 Some plugins are based on Cable Beach
 Cable Beach is Copyright (c) 2008 Intel Corporation
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Reflection;
 using System.Threading;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.RegionLoader.Filesystem;
 using OpenSim.Framework.RegionLoader.Web;
@@ -68,7 +69,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions

        public void Initialise()
        {
-            m_log.Error("[LOADREGIONS]: " + Name + " cannot be default-initialized!");
+            m_log.Error("[LOAD REGIONS PLUGIN]: " + Name + " cannot be default-initialized!");
            throw new PluginNotInitialisedException(Name);
        }

@@ -85,44 +86,46 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
            IRegionLoader regionLoader;
            if (m_openSim.ConfigSource.Source.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem")
            {
-                m_log.Info("[LOADREGIONS]: Loading region configurations from filesystem");
+                m_log.Info("[LOAD REGIONS PLUGIN]: Loading region configurations from filesystem");
                regionLoader = new RegionLoaderFileSystem();
            }
            else
            {
-                m_log.Info("[LOADREGIONSPLUGIN]: Loading region configurations from web");
+                m_log.Info("[LOAD REGIONS PLUGIN]: Loading region configurations from web");
                regionLoader = new RegionLoaderWebServer();
            }

-            m_log.Info("[LOADREGIONSPLUGIN]: Loading region configurations...");
-
            regionLoader.SetIniConfigSource(m_openSim.ConfigSource.Source);
            RegionInfo[] regionsToLoad = regionLoader.LoadRegions();

-            m_log.Info("[LOADREGIONSPLUGIN]: Loading specific shared modules...");
-            m_log.Info("[LOADREGIONSPLUGIN]: DynamicTextureModule...");
+            m_log.Info("[LOAD REGIONS PLUGIN]: Loading specific shared modules...");
+            m_log.Info("[LOAD REGIONS PLUGIN]: DynamicTextureModule...");
            m_openSim.ModuleLoader.LoadDefaultSharedModule(new DynamicTextureModule());
-            m_log.Info("[LOADREGIONSPLUGIN]: LoadImageURLModule...");
+            m_log.Info("[LOAD REGIONS PLUGIN]: LoadImageURLModule...");
            m_openSim.ModuleLoader.LoadDefaultSharedModule(new LoadImageURLModule());
-            m_log.Info("[LOADREGIONSPLUGIN]: XMLRPCModule...");
+            m_log.Info("[LOAD REGIONS PLUGIN]: XMLRPCModule...");
            m_openSim.ModuleLoader.LoadDefaultSharedModule(new XMLRPCModule());
-            m_log.Info("[LOADREGIONSPLUGIN]: AssetTransactionModule...");
-            m_openSim.ModuleLoader.LoadDefaultSharedModule(new AssetTransactionModule());
-            m_log.Info("[LOADREGIONSPLUGIN]: Done.");
+//            m_log.Info("[LOADREGIONSPLUGIN]: AssetTransactionModule...");
+//            m_openSim.ModuleLoader.LoadDefaultSharedModule(new AssetTransactionModule());
+            m_log.Info("[LOAD REGIONS PLUGIN]: Done.");

            if (!CheckRegionsForSanity(regionsToLoad))
            {
-                m_log.Error("[LOADREGIONS]: Halting startup due to conflicts in region configurations");
+                m_log.Error("[LOAD REGIONS PLUGIN]: Halting startup due to conflicts in region configurations");
                Environment.Exit(1);
            }

            for (int i = 0; i < regionsToLoad.Length; i++)
            {
                IScene scene;
-                m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " +
+                m_log.Debug("[LOAD REGIONS PLUGIN]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " +
                            Thread.CurrentThread.ManagedThreadId.ToString() +
                            ")");
+                
+                m_openSim.PopulateRegionEstateInfo(regionsToLoad[i]);
                m_openSim.CreateRegion(regionsToLoad[i], true, out scene);
+                regionsToLoad[i].EstateSettings.Save();
+                
                if (scene != null)
                {
                    m_newRegionCreatedHandler = OnNewRegionCreated;
@@ -150,9 +153,20 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
        /// <returns>True if we're sane, false if we're insane</returns>
        private bool CheckRegionsForSanity(RegionInfo[] regions)
        {
-            if (regions.Length <= 1)
+            if (regions.Length == 0)
                return true;

+            foreach (RegionInfo region in regions)
+            {
+                if (region.RegionID == UUID.Zero)
+                {
+                    m_log.ErrorFormat(
+                        "[LOAD REGIONS PLUGIN]: Region {0} has invalid UUID {1}",
+                        region.RegionName, region.RegionID);
+                    return false;
+                }
+            }
+
            for (int i = 0; i < regions.Length - 1; i++)
            {
                for (int j = i + 1; j < regions.Length; j++)
@@ -160,7 +174,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
                    if (regions[i].RegionID == regions[j].RegionID)
                    {
                        m_log.ErrorFormat(
-                            "[LOADREGIONS]: Regions {0} and {1} have the same UUID {2}",
+                            "[LOAD REGIONS PLUGIN]: Regions {0} and {1} have the same UUID {2}",
                            regions[i].RegionName, regions[j].RegionName, regions[i].RegionID);
                        return false;
                    }
@@ -168,14 +182,14 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
                        regions[i].RegionLocX == regions[j].RegionLocX && regions[i].RegionLocY == regions[j].RegionLocY)
                    {
                        m_log.ErrorFormat(
-                            "[LOADREGIONS]: Regions {0} and {1} have the same grid location ({2}, {3})",
+                            "[LOAD REGIONS PLUGIN]: Regions {0} and {1} have the same grid location ({2}, {3})",
                            regions[i].RegionName, regions[j].RegionName, regions[i].RegionLocX, regions[i].RegionLocY);
                        return false;
                    }
                    else if (regions[i].InternalEndPoint.Port == regions[j].InternalEndPoint.Port)
                    {
                        m_log.ErrorFormat(
-                            "[LOADREGIONS]: Regions {0} and {1} have the same internal IP port {2}",
+                            "[LOAD REGIONS PLUGIN]: Regions {0} and {1} have the same internal IP port {2}",
                            regions[i].RegionName, regions[j].RegionName, regions[i].InternalEndPoint.Port);
                        return false;
                    }
@@ -184,35 +198,5 @@ namespace OpenSim.ApplicationPlugins.LoadRegions

            return true;
        }
-
-        public void LoadRegionFromConfig(OpenSimBase openSim, ulong regionhandle)
-        {
-            m_log.Info("[LOADREGIONS]: Load Regions addin being initialised");
-
-            IRegionLoader regionLoader;
-            if (openSim.ConfigSource.Source.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem")
-            {
-                m_log.Info("[LOADREGIONS]: Loading Region Info from filesystem");
-                regionLoader = new RegionLoaderFileSystem();
-            }
-            else
-            {
-                m_log.Info("[LOADREGIONS]: Loading Region Info from web");
-                regionLoader = new RegionLoaderWebServer();
-            }
-
-            regionLoader.SetIniConfigSource(openSim.ConfigSource.Source);
-            RegionInfo[] regionsToLoad = regionLoader.LoadRegions();
-            for (int i = 0; i < regionsToLoad.Length; i++)
-            {
-                if (regionhandle == regionsToLoad[i].RegionHandle)
-                {
-                    IScene scene;
-                    m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " +
-                                Thread.CurrentThread.ManagedThreadId.ToString() + ")");
-                    openSim.CreateRegion(regionsToLoad[i], true, out scene);
-                }
-            }
-        }
    }
 }
--- a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
@@ -62,7 +62,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
                new List<ISharedRegionModule>();

 #region IApplicationPlugin implementation
-
+        
        public void Initialise (OpenSimBase openSim)
        {
            m_openSim = openSim;
@@ -91,66 +91,24 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
            {
                if (node.Type.GetInterface(typeof(ISharedRegionModule).ToString()) != null)
                {
-                    // Get the config string
-                    string moduleString =
-                            modulesConfig.GetString("Setup_" + node.Id, String.Empty);
-
-                    // We have a selector
-                    if (moduleString != String.Empty)
+                    if (CheckModuleEnabled(node, modulesConfig))
                    {
-                        // Allow disabling modules even if they don't have
-                        // support for it
-                        if (moduleString == "disabled")
-                            continue;
-
-                        // Split off port, if present
-                        string[] moduleParts = moduleString.Split(new char[] { '/' }, 2);
-                        // Format is [port/][class]
-                        string className = moduleParts[0];
-                        if (moduleParts.Length > 1)
-                            className = moduleParts[1];
-
-                        // Match the class name if given
-                        if (className != String.Empty &&
-                                node.Type.ToString() != className)
-                            continue;
+                        m_log.DebugFormat("[REGIONMODULES]: Found shared region module {0}, class {1}", node.Id, node.Type);
+                        m_sharedModules.Add(node);
                    }
-
-                    m_log.DebugFormat("[REGIONMODULES]: Found shared region module {0}, class {1}", node.Id, node.Type);
-                    m_sharedModules.Add(node);
                }
                else if (node.Type.GetInterface(typeof(INonSharedRegionModule).ToString()) != null)
                {
-                    // Get the config string
-                    string moduleString =
-                            modulesConfig.GetString("Setup_" + node.Id, String.Empty);
-
-                    // We have a selector
-                    if (moduleString != String.Empty)
+                    if (CheckModuleEnabled(node, modulesConfig))
                    {
-                        // Allow disabling modules even if they don't have
-                        // support for it
-                        if (moduleString == "disabled")
-                            continue;
-
-                        // Split off port, if present
-                        string[] moduleParts = moduleString.Split(new char[] { '/' }, 2);
-                        // Format is [port/][class]
-                        string className = moduleParts[0];
-                        if (moduleParts.Length > 1)
-                            className = moduleParts[1];
-
-                        // Match the class name if given
-                        if (className != String.Empty &&
-                                node.Type.ToString() != className)
-                            continue;
+                        m_log.DebugFormat("[REGIONMODULES]: Found non-shared region module {0}, class {1}", node.Id, node.Type);
+                        m_nonSharedModules.Add(node);
                    }
-
-                    m_log.DebugFormat("[REGIONMODULES]: Found non-shared region module {0}, class {1}", node.Id, node.Type);
-                    m_nonSharedModules.Add(node);
                }
                else
+                {
                    m_log.DebugFormat("[REGIONMODULES]: Found unknown type of module {0}, class {1}", node.Id, node.Type);
+                }
            }

            // Load and init the module. We try a constructor with a port
@@ -197,8 +155,6 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
                m_sharedInstances.Add(module);
                module.Initialise(m_openSim.ConfigSource.Source);
            }
-
-
        }

        public void PostInitialise ()
@@ -210,7 +166,6 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
            {
                module.PostInitialise();
            }
-
        }

 #endregion
@@ -244,7 +199,6 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController

 #endregion

-
        public string Version
        {
            get
@@ -262,6 +216,42 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
        }

 #region IRegionModulesController implementation
+        
+        /// <summary>
+        /// Check that the given module is no disabled in the [Modules] section of the config files.
+        /// </summary>
+        /// <param name="node"></param>
+        /// <param name="modulesConfig">The config section</param>
+        /// <returns>true if the module is enabled, false if it is disabled</returns>
+        protected bool CheckModuleEnabled(TypeExtensionNode node, IConfig modulesConfig)
+        {
+            // Get the config string
+            string moduleString =
+                    modulesConfig.GetString("Setup_" + node.Id, String.Empty);
+
+            // We have a selector
+            if (moduleString != String.Empty)
+            {
+                // Allow disabling modules even if they don't have
+                // support for it
+                if (moduleString == "disabled")
+                    return false;
+
+                // Split off port, if present
+                string[] moduleParts = moduleString.Split(new char[] { '/' }, 2);
+                // Format is [port/][class]
+                string className = moduleParts[0];
+                if (moduleParts.Length > 1)
+                    className = moduleParts[1];
+
+                // Match the class name if given
+                if (className != String.Empty &&
+                        node.Type.ToString() != className)
+                    return false;
+            }            
+            
+            return true;
+        }        

        // The root of all evil.
        // This is where we handle adding the modules to scenes when they
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
@@ -27,6 +27,7 @@

 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Xml;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -43,7 +44,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory

        // private static readonly int PARM_PATH   = 1;

-        private bool       enabled = false;
+//        private bool       enabled = false;
        private string     qPrefix = "appearance";

        /// <summary>
@@ -73,7 +74,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory

            // Activate if everything went OK

-            enabled = true;
+//            enabled = true;

            Rest.Log.InfoFormat("{0} User appearance services initialization complete", MsgId);
        }
@@ -94,7 +95,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory

        public void Close()
        {
-            enabled = false;
+//            enabled = false;
            Rest.Log.InfoFormat("{0} User appearance services closing down", MsgId);
        }

@@ -384,7 +385,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 //            }
 //
 //            rdata.Respond(String.Format("Appearance {0} : Normal completion", rdata.method));
-//            
+//
 //        }

        /// <summary>
@@ -449,7 +450,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 //                rdata.userAppearance = new AvatarAppearance();
 //                rdata.userAppearance.Owner = old.Owner;
 //                adata = new AvatarData(rdata.userAppearance);
-//                
+//
 //                Rest.AvatarServices.SetAvatar(rdata.userProfile.ID, adata);
 //
 //                rdata.Complete();
@@ -487,17 +488,18 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
                                    rdata.userAppearance.AvatarHeight = (float) Convert.ToDouble(xml.Value);
                                    indata = true;
                                }
-                                if (xml.MoveToAttribute("Owner"))
-                                {
-                                    rdata.userAppearance.Owner = (UUID)xml.Value;
-                                    indata = true;
-                                }
+//                                if (xml.MoveToAttribute("Owner"))
+//                                {
+//                                    rdata.userAppearance.Owner = (UUID)xml.Value;
+//                                    indata = true;
+//                                }
                                if (xml.MoveToAttribute("Serial"))
                                {
                                    rdata.userAppearance.Serial = Convert.ToInt32(xml.Value);
                                    indata = true;
                                }
                            break;
+/*
                            case "Body" :
                                if (xml.MoveToAttribute("Item"))
                                {
@@ -654,6 +656,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
                                    indata = true;
                                }
                            break;
+*/
                            case "Attachment" :
                                {

@@ -744,10 +747,11 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
                rdata.writer.WriteStartElement("Appearance");

                rdata.writer.WriteAttributeString("Height", rdata.userAppearance.AvatarHeight.ToString());
-                if (rdata.userAppearance.Owner != UUID.Zero)
-                    rdata.writer.WriteAttributeString("Owner", rdata.userAppearance.Owner.ToString());
+//                if (rdata.userAppearance.Owner != UUID.Zero)
+//                    rdata.writer.WriteAttributeString("Owner", rdata.userAppearance.Owner.ToString());
                rdata.writer.WriteAttributeString("Serial", rdata.userAppearance.Serial.ToString());

+/*
                FormatPart(rdata, "Body", rdata.userAppearance.BodyItem, rdata.userAppearance.BodyAsset);
                FormatPart(rdata, "Skin", rdata.userAppearance.SkinItem, rdata.userAppearance.SkinAsset);
                FormatPart(rdata, "Hair", rdata.userAppearance.HairItem, rdata.userAppearance.HairAsset);
@@ -764,26 +768,20 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory

                FormatPart(rdata, "UnderShirt", rdata.userAppearance.UnderShirtItem, rdata.userAppearance.UnderShirtAsset);
                FormatPart(rdata, "UnderPants", rdata.userAppearance.UnderPantsItem, rdata.userAppearance.UnderPantsAsset);
+*/
+                Rest.Log.DebugFormat("{0} FormatUserAppearance: Formatting attachments", MsgId);

-                Hashtable attachments = rdata.userAppearance.GetAttachments();
-
-                if (attachments != null)
+                rdata.writer.WriteStartElement("Attachments");
+                List<AvatarAttachment> attachments = rdata.userAppearance.GetAttachments();
+                foreach (AvatarAttachment attach in attachments)
                {
-
-                    Rest.Log.DebugFormat("{0} FormatUserAppearance: Formatting attachments", MsgId);
-
-                    rdata.writer.WriteStartElement("Attachments");
-                    for (int i = 0; i < attachments.Count; i++)
-                    {
-                        Hashtable attachment = attachments[i] as Hashtable;
-                        rdata.writer.WriteStartElement("Attachment");
-                        rdata.writer.WriteAttributeString("AtPoint", i.ToString());
-                        rdata.writer.WriteAttributeString("Item", (string) attachment["item"]);
-                        rdata.writer.WriteAttributeString("Asset", (string) attachment["asset"]);
-                        rdata.writer.WriteEndElement();
-                    }
+                    rdata.writer.WriteStartElement("Attachment");
+                    rdata.writer.WriteAttributeString("AtPoint", attach.AttachPoint.ToString());
+                    rdata.writer.WriteAttributeString("Item", attach.ItemID.ToString());
+                    rdata.writer.WriteAttributeString("Asset", attach.AssetID.ToString());
                    rdata.writer.WriteEndElement();
                }
+                rdata.writer.WriteEndElement();

                Primitive.TextureEntry texture = rdata.userAppearance.Texture;

--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
@@ -46,12 +46,12 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
    public class RestInventoryServices : IRest
    {
 //        private static readonly int PARM_USERID = 0;
-        private static readonly int PARM_PATH   = 1;
+//        private static readonly int PARM_PATH   = 1;

 //        private bool       enabled = false;
        private string     qPrefix = "inventory";

-        private static readonly string PRIVATE_ROOT_NAME = "My Inventory";
+//        private static readonly string PRIVATE_ROOT_NAME = "My Inventory";

        /// <summary>
        /// The constructor makes sure that the service prefix is absolute
@@ -1295,6 +1295,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
            rdata.writer.WriteAttributeString("folder", String.Empty, i.Folder.ToString());
            rdata.writer.WriteAttributeString("owner", String.Empty, i.Owner.ToString());
            rdata.writer.WriteAttributeString("creator", String.Empty, i.CreatorId);
+            rdata.writer.WriteAttributeString("creatordata", String.Empty, i.CreatorData);
            rdata.writer.WriteAttributeString("creationdate", String.Empty, i.CreationDate.ToString());
            rdata.writer.WriteAttributeString("invtype", String.Empty, i.InvType.ToString());
            rdata.writer.WriteAttributeString("assettype", String.Empty, i.AssetType.ToString());
@@ -2128,17 +2129,17 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
                }
                catch (DllNotFoundException)
                {
-                    Rest.Log.ErrorFormat("OpenJpeg is not installed correctly on this system.   Asset Data is emtpy for {0}", ic.Item.Name);
+                    Rest.Log.ErrorFormat("OpenJpeg is not installed correctly on this system.   Asset Data is empty for {0}", ic.Item.Name);
                    ic.Asset.Data = new Byte[0];
                }
                catch (IndexOutOfRangeException)
                {
-                    Rest.Log.ErrorFormat("OpenJpeg was unable to encode this.   Asset Data is emtpy for {0}", ic.Item.Name);
+                    Rest.Log.ErrorFormat("OpenJpeg was unable to encode this.   Asset Data is empty for {0}", ic.Item.Name);
                    ic.Asset.Data = new Byte[0];
                }
                catch (Exception)
                {
-                    Rest.Log.ErrorFormat("OpenJpeg was unable to encode this.   Asset Data is emtpy for {0}", ic.Item.Name);
+                    Rest.Log.ErrorFormat("OpenJpeg was unable to encode this.   Asset Data is empty for {0}", ic.Item.Name);
                    ic.Asset.Data = new Byte[0];
                }
            }
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs
@@ -148,7 +148,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory.Tests

                Rest.main.SceneManager.ForEachScene(delegate(Scene s)
                {
-                    s.ForEachScenePresence(delegate(ScenePresence sp)
+                    s.ForEachRootScenePresence(delegate(ScenePresence sp)
                    {
                        if (sp.Firstname == names[0] && sp.Lastname == names[1])
                        {
@@ -168,8 +168,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory.Tests
                        float x = Convert.ToSingle(rdata.Parameters[PARM_MOVE_X]);
                        float y = Convert.ToSingle(rdata.Parameters[PARM_MOVE_Y]);
                        float z = Convert.ToSingle(rdata.Parameters[PARM_MOVE_Z]);
-                        Vector3 vector = new Vector3(x,y,z);
-                        presence.DoAutoPilot(0,vector,presence.ControllingClient);
+                        Vector3 vector = new Vector3(x, y, z);
+                        presence.MoveToTarget(vector, false, false);
                    }
                    catch (Exception e)
                    {
--- a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
@@ -41,7 +41,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
    {
        #region GET methods
        public string GetHandler(string request, string path, string param,
-                                 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
        {
            // foreach (string h in httpRequest.Headers.AllKeys)
            //     foreach (string v in httpRequest.Headers.GetValues(h))
@@ -64,7 +64,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
            }
        }

-        public string GetHandlerRegions(OSHttpResponse httpResponse)
+        public string GetHandlerRegions(IOSHttpResponse httpResponse)
        {
            RestXmlWriter rxw = new RestXmlWriter(new StringWriter());

@@ -95,7 +95,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
            return rxw.ToString();
        }

-        public string GetHandlerRegion(OSHttpResponse httpResponse, string param)
+        public string GetHandlerRegion(IOSHttpResponse httpResponse, string param)
        {
            // be resilient and don't get confused by a terminating '/'
            param = param.TrimEnd(new char[]{'/'});
@@ -180,7 +180,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
        }
        #endregion GET methods

-        protected string RegionTerrain(OSHttpResponse httpResponse, Scene scene)
+        protected string RegionTerrain(IOSHttpResponse httpResponse, Scene scene)
        {
            httpResponse.SendChunked = true;
            httpResponse.ContentType = "text/xml";
@@ -190,7 +190,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
            //               "GET", "terrain not implemented");
        }

-        protected string RegionStats(OSHttpResponse httpResponse, Scene scene)
+        protected string RegionStats(IOSHttpResponse httpResponse, Scene scene)
        {
            int users = scene.GetRootAgentCount();
            int objects = scene.Entities.Count - users;
@@ -213,7 +213,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
            return rxw.ToString();
        }

-        protected string RegionPrims(OSHttpResponse httpResponse, Scene scene, Vector3 min, Vector3 max)
+        protected string RegionPrims(IOSHttpResponse httpResponse, Scene scene, Vector3 min, Vector3 max)
        {
            httpResponse.SendChunked = true;
            httpResponse.ContentType = "text/xml";
--- a/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs
@@ -40,7 +40,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
    {
        #region GET methods
        public string GetRegionInfoHandler(string request, string path, string param,
-                                           OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                                           IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
        {
            // foreach (string h in httpRequest.Headers.AllKeys)
            //     foreach (string v in httpRequest.Headers.GetValues(h))
@@ -64,7 +64,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
            }
        }

-        public string GetRegionInfoHandlerRegions(OSHttpResponse httpResponse)
+        public string GetRegionInfoHandlerRegions(IOSHttpResponse httpResponse)
        {
            RestXmlWriter rxw = new RestXmlWriter(new StringWriter());

--- a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
@@ -40,7 +40,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
        #region POST methods

        public string PostHandler(string request, string path, string param,
-                                  OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                                  IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
        {
            // foreach (string h in httpRequest.Headers.AllKeys)
            //     foreach (string v in httpRequest.Headers.GetValues(h))
@@ -92,7 +92,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
            }
        }

-        public string CreateRegion(OSHttpRequest request, OSHttpResponse response)
+        public string CreateRegion(IOSHttpRequest request, IOSHttpResponse response)
        {
            RestXmlWriter rxw = new RestXmlWriter(new StringWriter());

@@ -108,7 +108,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
            return rxw.ToString();
        }

-        public string LoadPrims(string requestBody, OSHttpRequest request, OSHttpResponse response, Scene scene)
+        public string LoadPrims(string requestBody, IOSHttpRequest request, IOSHttpResponse response, Scene scene)
        {
            IRegionSerialiserModule serialiser = scene.RequestModuleInterface<IRegionSerialiserModule>();
            if (serialiser != null)
--- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
@@ -328,7 +328,7 @@ namespace OpenSim.ApplicationPlugins.Rest
        /// </summary>
        /// <param name="request">HTTP request header</param>
        /// <returns>true when the HTTP request came from god.</returns>
-        protected bool IsGod(OSHttpRequest request)
+        protected bool IsGod(IOSHttpRequest request)
        {
            string[] keys = request.Headers.GetValues("X-OpenSim-Godkey");
            if (null == keys) return false;
@@ -342,7 +342,7 @@ namespace OpenSim.ApplicationPlugins.Rest
        /// HTTP header is indeed the password on file for the avatar
        /// specified by the UUID
        /// </summary>
-        protected bool IsVerifiedUser(OSHttpRequest request, UUID uuid)
+        protected bool IsVerifiedUser(IOSHttpRequest request, UUID uuid)
        {
            // XXX under construction
            return false;
@@ -377,7 +377,7 @@ namespace OpenSim.ApplicationPlugins.Rest
        /// <param name="message">failure message</param>
        /// <remarks>This should probably set a return code as
        /// well. (?)</remarks>
-        protected string Failure(OSHttpResponse response, OSHttpStatusCode status,
+        protected string Failure(IOSHttpResponse response, OSHttpStatusCode status,
                                 string method, string format, params string[] msg)
        {
            string m = String.Format(format, msg);
@@ -396,7 +396,7 @@ namespace OpenSim.ApplicationPlugins.Rest
        /// <param name="e">exception causing the failure message</param>
        /// <remarks>This should probably set a return code as
        /// well. (?)</remarks>
-        public string Failure(OSHttpResponse response, OSHttpStatusCode status,
+        public string Failure(IOSHttpResponse response, OSHttpStatusCode status,
                              string method, Exception e)
        {
            string m = String.Format("exception occurred: {0}", e.Message);
--- a/OpenSim/Capabilities/Caps.cs
+++ b/OpenSim/Capabilities/Caps.cs
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Services.Interfaces;
+
+// using OpenSim.Region.Framework.Interfaces;
+
+namespace OpenSim.Framework.Capabilities
+{
+    /// <summary>
+    /// XXX Probably not a particularly nice way of allow us to get the scene presence from the scene (chiefly so that
+    /// we can popup a message on the user's client if the inventory service has permanently failed).  But I didn't want
+    /// to just pass the whole Scene into CAPS.
+    /// </summary>
+    public delegate IClientAPI GetClientDelegate(UUID agentID);
+
+    public class Caps
+    {
+//        private static readonly ILog m_log =
+//            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private string m_httpListenerHostName;
+        private uint m_httpListenPort;
+
+        /// <summary>
+        /// This is the uuid portion of every CAPS path.  It is used to make capability urls private to the requester.
+        /// </summary>
+        private string m_capsObjectPath;
+        public string CapsObjectPath { get { return m_capsObjectPath; } }
+
+        private CapsHandlers m_capsHandlers;
+        private Dictionary<string, string> m_externalCapsHandlers;
+
+        private IHttpServer m_httpListener;
+        private UUID m_agentID;
+        private string m_regionName;
+
+        public UUID AgentID
+        {
+            get { return m_agentID; }
+        }
+
+        public string RegionName
+        {
+            get { return m_regionName; }
+        }
+
+        public string HostName
+        {
+            get { return m_httpListenerHostName; }
+        }
+
+        public uint Port
+        {
+            get { return m_httpListenPort; }
+        }
+
+        public IHttpServer HttpListener
+        {
+            get { return m_httpListener; }
+        }
+
+        public bool SSLCaps
+        {
+            get { return m_httpListener.UseSSL; }
+        }
+
+        public string SSLCommonName
+        {
+            get { return m_httpListener.SSLCommonName; }
+        }
+
+        public CapsHandlers CapsHandlers
+        {
+            get { return m_capsHandlers; }
+        }
+
+        public Dictionary<string, string> ExternalCapsHandlers
+        {
+            get { return m_externalCapsHandlers; }
+        }
+
+        public Caps(IHttpServer httpServer, string httpListen, uint httpPort, string capsPath,
+                    UUID agent, string regionName)
+        {
+            m_capsObjectPath = capsPath;
+            m_httpListener = httpServer;
+            m_httpListenerHostName = httpListen;
+
+            m_httpListenPort = httpPort;
+
+            if (httpServer != null && httpServer.UseSSL)
+            {
+                m_httpListenPort = httpServer.SSLPort;
+                httpListen = httpServer.SSLCommonName;
+                httpPort = httpServer.SSLPort;
+            }
+
+            m_agentID = agent;
+            m_capsHandlers = new CapsHandlers(httpServer, httpListen, httpPort, (httpServer == null) ? false : httpServer.UseSSL);
+            m_externalCapsHandlers = new Dictionary<string, string>();
+            m_regionName = regionName;
+        }
+
+        /// <summary>
+        /// Register a handler.  This allows modules to register handlers.
+        /// </summary>
+        /// <param name="capName"></param>
+        /// <param name="handler"></param>
+        public void RegisterHandler(string capName, IRequestHandler handler)
+        {
+            m_capsHandlers[capName] = handler;
+            //m_log.DebugFormat("[CAPS]: Registering handler for \"{0}\": path {1}", capName, handler.Path);
+        }
+
+        /// <summary>
+        /// Register an external handler. The service for this capability is somewhere else
+        /// given by the URL.
+        /// </summary>
+        /// <param name="capsName"></param>
+        /// <param name="url"></param>
+        public void RegisterHandler(string capsName, string url)
+        {
+            m_externalCapsHandlers.Add(capsName, url);
+        }
+
+        /// <summary>
+        /// Remove all CAPS service handlers.
+        /// </summary>
+        public void DeregisterHandlers()
+        {
+            if (m_capsHandlers != null)
+            {
+                foreach (string capsName in m_capsHandlers.Caps)
+                {
+                    m_capsHandlers.Remove(capsName);
+                }
+            }
+        }
+    }
+}
--- a/OpenSim/Framework/Capabilities/CapsHandlers.cs
+++ b/OpenSim/Framework/Capabilities/CapsHandlers.cs
@@ -51,11 +51,10 @@ namespace OpenSim.Framework.Capabilities
        /// supplied BaseHttpServer.
        /// </summary>
        /// <param name="httpListener">base HTTP server</param>
-        /// <param name="httpListenerHostname">host name of the HTTP
-        /// server</param>
+        /// <param name="httpListenerHostname">host name of the HTTP server</param>
        /// <param name="httpListenerPort">HTTP port</param>
        public CapsHandlers(BaseHttpServer httpListener, string httpListenerHostname, uint httpListenerPort)
-         : this (httpListener,httpListenerHostname,httpListenerPort, false)
+            : this(httpListener,httpListenerHostname,httpListenerPort, false)
        {
        }

@@ -74,7 +73,7 @@ namespace OpenSim.Framework.Capabilities
            m_httpListenerHostName = httpListenerHostname;
            m_httpListenerPort = httpListenerPort;
            m_useSSL = https;
-            if (m_useSSL)
+            if (httpListener != null && m_useSSL)
            {
                m_httpListenerHostName = httpListener.SSLCommonName;
                m_httpListenerPort = httpListener.SSLPort;
@@ -88,44 +87,52 @@ namespace OpenSim.Framework.Capabilities
        /// handler to be removed</param>
        public void Remove(string capsName)
        {
-            // This line must be here, or caps will break!
-            m_httpListener.RemoveStreamHandler("POST", m_capsHandlers[capsName].Path);
-            m_capsHandlers.Remove(capsName);
+            lock (m_capsHandlers)
+            {
+                m_httpListener.RemoveStreamHandler("POST", m_capsHandlers[capsName].Path);
+                m_httpListener.RemoveStreamHandler("GET", m_capsHandlers[capsName].Path);
+                m_capsHandlers.Remove(capsName);
+            }
        }

        public bool ContainsCap(string cap)
        {
-            return m_capsHandlers.ContainsKey(cap);
+            lock (m_capsHandlers)
+                return m_capsHandlers.ContainsKey(cap);
        }

        /// <summary>
        /// The indexer allows us to treat the CapsHandlers object
        /// in an intuitive dictionary like way.
        /// </summary>
-        /// <Remarks>
+        /// <remarks>
        /// The indexer will throw an exception when you try to
        /// retrieve a cap handler for a cap that is not contained in
        /// CapsHandlers.
-        /// </Remarks>
+        /// </remarks>
        public IRequestHandler this[string idx]
        {
            get
            {
-                return m_capsHandlers[idx];
+                lock (m_capsHandlers)
+                    return m_capsHandlers[idx];
            }

            set
            {
-                if (m_capsHandlers.ContainsKey(idx))
+                lock (m_capsHandlers)
                {
-                    m_httpListener.RemoveStreamHandler("POST", m_capsHandlers[idx].Path);
-                    m_capsHandlers.Remove(idx);
+                    if (m_capsHandlers.ContainsKey(idx))
+                    {
+                        m_httpListener.RemoveStreamHandler("POST", m_capsHandlers[idx].Path);
+                        m_capsHandlers.Remove(idx);
+                    }
+    
+                    if (null == value) return;
+    
+                    m_capsHandlers[idx] = value;
+                    m_httpListener.AddStreamHandler(value);
                }
-
-                if (null == value) return;
-
-                m_capsHandlers[idx] = value;
-                m_httpListener.AddStreamHandler(value);
            }
        }

@@ -137,9 +144,12 @@ namespace OpenSim.Framework.Capabilities
        {
            get
            {
-                string[] __keys = new string[m_capsHandlers.Keys.Count];
-                m_capsHandlers.Keys.CopyTo(__keys, 0);
-                return __keys;
+                lock (m_capsHandlers)
+                {
+                    string[] __keys = new string[m_capsHandlers.Keys.Count];
+                    m_capsHandlers.Keys.CopyTo(__keys, 0);
+                    return __keys;
+                }
            }
        }

@@ -147,25 +157,29 @@ namespace OpenSim.Framework.Capabilities
        /// Return an LLSD-serializable Hashtable describing the
        /// capabilities and their handler details.
        /// </summary>
-        public Hashtable CapsDetails
+        /// <param name="excludeSeed">If true, then exclude the seed cap.</param>
+        public Hashtable GetCapsDetails(bool excludeSeed)
        {
-            get
-            {
-                Hashtable caps = new Hashtable();
-                string protocol = "http://";
-                
-                if (m_useSSL)
-                    protocol = "https://";
+            Hashtable caps = new Hashtable();
+            string protocol = "http://";
+            
+            if (m_useSSL)
+                protocol = "https://";

-                string baseUrl = protocol + m_httpListenerHostName + ":" + m_httpListenerPort.ToString();
+            string baseUrl = protocol + m_httpListenerHostName + ":" + m_httpListenerPort.ToString();
+
+            lock (m_capsHandlers)
+            {
                foreach (string capsName in m_capsHandlers.Keys)
                {
-                    // skip SEED cap
-                    if ("SEED" == capsName) continue;
+                    if (excludeSeed && "SEED" == capsName)
+                        continue;
+
                    caps[capsName] = baseUrl + m_capsHandlers[capsName].Path;
                }
-                return caps;
            }
+
+            return caps;
        }
    }
-}
+}
--- a/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs
+++ b/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+using OpenSim.Framework.Capabilities;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Services.Interfaces;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+using OSDArray = OpenMetaverse.StructuredData.OSDArray;
+using OSDMap = OpenMetaverse.StructuredData.OSDMap;
+
+namespace OpenSim.Capabilities.Handlers
+{
+    public class FetchInventory2Handler
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private IInventoryService m_inventoryService;
+
+        public FetchInventory2Handler(IInventoryService invService)
+        {
+            m_inventoryService = invService;
+        }
+
+        public string FetchInventoryRequest(string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        {
+//            m_log.DebugFormat("[FETCH INVENTORY HANDLER]: Received FetchInventory capabilty request");
+
+            OSDMap requestmap = (OSDMap)OSDParser.DeserializeLLSDXml(Utils.StringToBytes(request));
+            OSDArray itemsRequested = (OSDArray)requestmap["items"];
+
+            string reply;
+            LLSDFetchInventory llsdReply = new LLSDFetchInventory();
+
+            foreach (OSDMap osdItemId in itemsRequested)
+            {
+                UUID itemId = osdItemId["item_id"].AsUUID();
+
+                InventoryItemBase item = m_inventoryService.GetItem(new InventoryItemBase(itemId));
+
+                if (item != null)
+                {
+                    // We don't know the agent that this request belongs to so we'll use the agent id of the item
+                    // which will be the same for all items.
+                    llsdReply.agent_id = item.Owner;
+
+                    llsdReply.items.Array.Add(ConvertInventoryItem(item));
+                }
+            }
+
+            reply = LLSDHelpers.SerialiseLLSDReply(llsdReply);
+
+            return reply;
+        }
+
+        /// <summary>
+        /// Convert an internal inventory item object into an LLSD object.
+        /// </summary>
+        /// <param name="invItem"></param>
+        /// <returns></returns>
+        private LLSDInventoryItem ConvertInventoryItem(InventoryItemBase invItem)
+        {
+            LLSDInventoryItem llsdItem = new LLSDInventoryItem();
+            llsdItem.asset_id = invItem.AssetID;
+            llsdItem.created_at = invItem.CreationDate;
+            llsdItem.desc = invItem.Description;
+            llsdItem.flags = (int)invItem.Flags;
+            llsdItem.item_id = invItem.ID;
+            llsdItem.name = invItem.Name;
+            llsdItem.parent_id = invItem.Folder;
+
+            try
+            {
+                llsdItem.type = Utils.AssetTypeToString((AssetType)invItem.AssetType);
+                llsdItem.inv_type = Utils.InventoryTypeToString((InventoryType)invItem.InvType);
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat(
+                    "[WEB FETCH INV DESC HANDLER]: Problem setting asset {0} inventory {1} types while converting inventory item {2}: {3}",
+                    invItem.AssetType, invItem.InvType, invItem.Name, e.Message);
+            }
+
+            llsdItem.permissions = new LLSDPermissions();
+            llsdItem.permissions.creator_id = invItem.CreatorIdAsUuid;
+            llsdItem.permissions.base_mask = (int)invItem.CurrentPermissions;
+            llsdItem.permissions.everyone_mask = (int)invItem.EveryOnePermissions;
+            llsdItem.permissions.group_id = invItem.GroupID;
+            llsdItem.permissions.group_mask = (int)invItem.GroupPermissions;
+            llsdItem.permissions.is_owner_group = invItem.GroupOwned;
+            llsdItem.permissions.next_owner_mask = (int)invItem.NextPermissions;
+            llsdItem.permissions.owner_id = invItem.Owner;
+            llsdItem.permissions.owner_mask = (int)invItem.CurrentPermissions;
+            llsdItem.sale_info = new LLSDSaleInfo();
+            llsdItem.sale_info.sale_price = invItem.SalePrice;
+            switch (invItem.SaleType)
+            {
+                default:
+                    llsdItem.sale_info.sale_type = "not";
+                    break;
+                case 1:
+                    llsdItem.sale_info.sale_type = "original";
+                    break;
+                case 2:
+                    llsdItem.sale_info.sale_type = "copy";
+                    break;
+                case 3:
+                    llsdItem.sale_info.sale_type = "contents";
+                    break;
+            }
+
+            return llsdItem;
+        }
+    }
+}
--- a/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2ServerConnector.cs
+++ b/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2ServerConnector.cs
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using Nini.Config;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Server.Handlers.Base;
+using OpenMetaverse;
+
+namespace OpenSim.Capabilities.Handlers
+{
+    public class FetchInventory2ServerConnector : ServiceConnector
+    {
+        private IInventoryService m_InventoryService;
+        private string m_ConfigName = "CapsService";
+
+        public FetchInventory2ServerConnector(IConfigSource config, IHttpServer server, string configName)
+            : base(config, server, configName)
+        {
+            if (configName != String.Empty)
+                m_ConfigName = configName;
+
+            IConfig serverConfig = config.Configs[m_ConfigName];
+            if (serverConfig == null)
+                throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
+
+            string invService = serverConfig.GetString("InventoryService", String.Empty);
+
+            if (invService == String.Empty)
+                throw new Exception("No InventoryService in config file");
+
+            Object[] args = new Object[] { config };
+            m_InventoryService = ServerUtils.LoadPlugin<IInventoryService>(invService, args);
+
+            if (m_InventoryService == null)
+                throw new Exception(String.Format("Failed to load InventoryService from {0}; config is {1}", invService, m_ConfigName));
+
+            FetchInventory2Handler fiHandler = new FetchInventory2Handler(m_InventoryService);
+            IRequestHandler reqHandler
+                = new RestStreamHandler("POST", "/CAPS/FetchInventory/", fiHandler.FetchInventoryRequest);
+            server.AddStreamHandler(reqHandler);
+        }
+    }
+}
--- a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Reflection;
+using System.IO;
+using System.Web;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Services.Interfaces;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+
+namespace OpenSim.Capabilities.Handlers
+{
+    public class GetMeshHandler 
+    {
+//        private static readonly ILog m_log =
+//            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
+        private IAssetService m_assetService;
+
+        public GetMeshHandler(IAssetService assService)
+        {
+            m_assetService = assService;
+        }
+
+        public Hashtable ProcessGetMesh(Hashtable request, UUID AgentId, Caps cap)
+        {
+            Hashtable responsedata = new Hashtable();
+            responsedata["int_response_code"] = 400; //501; //410; //404;
+            responsedata["content_type"] = "text/plain";
+            responsedata["keepalive"] = false;
+            responsedata["str_response_string"] = "Request wasn't what was expected";
+
+            string meshStr = string.Empty;
+
+            if (request.ContainsKey("mesh_id"))
+                meshStr = request["mesh_id"].ToString();
+
+            UUID meshID = UUID.Zero;
+            if (!String.IsNullOrEmpty(meshStr) && UUID.TryParse(meshStr, out meshID))
+            {
+                if (m_assetService == null)
+                {
+                    responsedata["int_response_code"] = 404; //501; //410; //404;
+                    responsedata["content_type"] = "text/plain";
+                    responsedata["keepalive"] = false;
+                    responsedata["str_response_string"] = "The asset service is unavailable.  So is your mesh.";
+                    return responsedata;
+                }
+
+                AssetBase mesh = m_assetService.Get(meshID.ToString());
+
+                if (mesh != null)
+                {
+                    if (mesh.Type == (SByte)AssetType.Mesh)
+                    {
+                        responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data);
+                        responsedata["content_type"] = "application/vnd.ll.mesh";
+                        responsedata["int_response_code"] = 200;
+                    }
+                    // Optionally add additional mesh types here
+                    else
+                    {
+                        responsedata["int_response_code"] = 404; //501; //410; //404;
+                        responsedata["content_type"] = "text/plain";
+                        responsedata["keepalive"] = false;
+                        responsedata["str_response_string"] = "Unfortunately, this asset isn't a mesh.";
+                        return responsedata;
+                    }
+                }
+                else
+                {
+                    responsedata["int_response_code"] = 404; //501; //410; //404;
+                    responsedata["content_type"] = "text/plain";
+                    responsedata["keepalive"] = false;
+                    responsedata["str_response_string"] = "Your Mesh wasn't found.  Sorry!";
+                    return responsedata;
+                }
+            }
+
+            return responsedata;
+        }
+    }
+}
--- a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs
+++ b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using Nini.Config;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Server.Handlers.Base;
+using OpenSim.Framework.Servers;
+
+using OpenMetaverse;
+
+namespace OpenSim.Capabilities.Handlers
+{
+    public class GetMeshServerConnector : ServiceConnector
+    {
+        private IAssetService m_AssetService;
+        private string m_ConfigName = "CapsService";
+
+        public GetMeshServerConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
+        {
+            if (configName != String.Empty)
+                m_ConfigName = configName;
+
+            IConfig serverConfig = config.Configs[m_ConfigName];
+            if (serverConfig == null)
+                throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
+
+            string assetService = serverConfig.GetString("AssetService", String.Empty);
+
+            if (assetService == String.Empty)
+                throw new Exception("No AssetService in config file");
+
+            Object[] args = new Object[] { config };
+            m_AssetService =
+                    ServerUtils.LoadPlugin<IAssetService>(assetService, args);
+
+            if (m_AssetService == null)
+                throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName));
+
+            GetMeshHandler gmeshHandler = new GetMeshHandler(m_AssetService);
+            IRequestHandler reqHandler = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(),
+                                                       delegate(Hashtable m_dhttpMethod)
+                                                       {
+                                                           return gmeshHandler.ProcessGetMesh(m_dhttpMethod, UUID.Zero, null);
+                                                       });
+            server.AddStreamHandler(reqHandler);
+        }
+
+    }
+}
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
@@ -0,0 +1,371 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Reflection;
+using System.IO;
+using System.Web;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenMetaverse.Imaging;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Services.Interfaces;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+
+namespace OpenSim.Capabilities.Handlers
+{
+    public class GetTextureHandler : BaseStreamHandler
+    {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private IAssetService m_assetService;
+
+        public const string DefaultFormat = "x-j2c";
+
+        // TODO: Change this to a config option
+        const string REDIRECT_URL = null;
+
+        public GetTextureHandler(string path, IAssetService assService) :
+                base("GET", path)
+        {
+            m_assetService = assService;
+        }
+
+        public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        {
+            // Try to parse the texture ID from the request URL
+            NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query);
+            string textureStr = query.GetOne("texture_id");
+            string format = query.GetOne("format");
+
+            //m_log.DebugFormat("[GETTEXTURE]: called {0}", textureStr);
+
+            if (m_assetService == null)
+            {
+                m_log.Error("[GETTEXTURE]: Cannot fetch texture " + textureStr + " without an asset service");
+                httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
+                return null;
+            }
+
+            UUID textureID;
+            if (!String.IsNullOrEmpty(textureStr) && UUID.TryParse(textureStr, out textureID))
+            {
+//                m_log.DebugFormat("[GETTEXTURE]: Received request for texture id {0}", textureID);
+                
+                string[] formats;
+                if (format != null && format != string.Empty)
+                {
+                    formats = new string[1] { format.ToLower() };
+                }
+                else
+                {
+                    formats = WebUtil.GetPreferredImageTypes(httpRequest.Headers.Get("Accept"));
+                    if (formats.Length == 0)
+                        formats = new string[1] { DefaultFormat }; // default
+
+                }
+                // OK, we have an array with preferred formats, possibly with only one entry
+
+                httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
+                foreach (string f in formats)
+                {
+                    if (FetchTexture(httpRequest, httpResponse, textureID, f))
+                        break;
+                }
+            }
+            else
+            {
+                m_log.Warn("[GETTEXTURE]: Failed to parse a texture_id from GetTexture request: " + httpRequest.Url);
+            }
+
+//            m_log.DebugFormat(
+//                "[GETTEXTURE]: For texture {0} sending back response {1}, data length {2}",
+//                textureID, httpResponse.StatusCode, httpResponse.ContentLength);
+
+            httpResponse.Send();
+            return null;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="httpRequest"></param>
+        /// <param name="httpResponse"></param>
+        /// <param name="textureID"></param>
+        /// <param name="format"></param>
+        /// <returns>False for "caller try another codec"; true otherwise</returns>
+        private bool FetchTexture(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse, UUID textureID, string format)
+        {
+//            m_log.DebugFormat("[GETTEXTURE]: {0} with requested format {1}", textureID, format);
+            AssetBase texture;
+
+            string fullID = textureID.ToString();
+            if (format != DefaultFormat)
+                fullID = fullID + "-" + format;
+
+            if (!String.IsNullOrEmpty(REDIRECT_URL))
+            {
+                // Only try to fetch locally cached textures. Misses are redirected
+                texture = m_assetService.GetCached(fullID);
+
+                if (texture != null)
+                {
+                    if (texture.Type != (sbyte)AssetType.Texture)
+                    {
+                        httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
+                        return true;
+                    }
+                    WriteTextureData(httpRequest, httpResponse, texture, format);
+                }
+                else
+                {
+                    string textureUrl = REDIRECT_URL + textureID.ToString();
+                    m_log.Debug("[GETTEXTURE]: Redirecting texture request to " + textureUrl);
+                    httpResponse.RedirectLocation = textureUrl;
+                    return true;
+                }
+            }
+            else // no redirect
+            {
+                // try the cache
+                texture = m_assetService.GetCached(fullID);
+
+                if (texture == null)
+                {
+                    //m_log.DebugFormat("[GETTEXTURE]: texture was not in the cache");
+
+                    // Fetch locally or remotely. Misses return a 404
+                    texture = m_assetService.Get(textureID.ToString());
+
+                    if (texture != null)
+                    {
+                        if (texture.Type != (sbyte)AssetType.Texture)
+                        {
+                            httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
+                            return true;
+                        }
+                        if (format == DefaultFormat)
+                        {
+                            WriteTextureData(httpRequest, httpResponse, texture, format);
+                            return true;
+                        }
+                        else
+                        {
+                            AssetBase newTexture = new AssetBase(texture.ID + "-" + format, texture.Name, (sbyte)AssetType.Texture, texture.Metadata.CreatorID);
+                            newTexture.Data = ConvertTextureData(texture, format);
+                            if (newTexture.Data.Length == 0)
+                                return false; // !!! Caller try another codec, please!
+
+                            newTexture.Flags = AssetFlags.Collectable;
+                            newTexture.Temporary = true;
+                            m_assetService.Store(newTexture);
+                            WriteTextureData(httpRequest, httpResponse, newTexture, format);
+                            return true;
+                        }
+                    }
+               }
+               else // it was on the cache
+               {
+                   //m_log.DebugFormat("[GETTEXTURE]: texture was in the cache");
+                   WriteTextureData(httpRequest, httpResponse, texture, format);
+                   return true;
+               }
+            }
+
+            // not found
+//            m_log.Warn("[GETTEXTURE]: Texture " + textureID + " not found");
+            httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
+            return true;
+        }
+
+        private void WriteTextureData(IOSHttpRequest request, IOSHttpResponse response, AssetBase texture, string format)
+        {
+            string range = request.Headers.GetOne("Range");
+
+            if (!String.IsNullOrEmpty(range)) // JP2's only
+            {
+                // Range request
+                int start, end;
+                if (TryParseRange(range, out start, out end))
+                {
+
+                    // Before clamping start make sure we can satisfy it in order to avoid
+                    // sending back the last byte instead of an error status
+                    if (start >= texture.Data.Length)
+                    {
+                        response.StatusCode = (int)System.Net.HttpStatusCode.RequestedRangeNotSatisfiable;
+                    }
+                    else
+                    {
+                        end = Utils.Clamp(end, 0, texture.Data.Length - 1);
+                        start = Utils.Clamp(start, 0, end);
+                        int len = end - start + 1;
+
+                        //m_log.Debug("Serving " + start + " to " + end + " of " + texture.Data.Length + " bytes for texture " + texture.ID);
+
+                        // Always return PartialContent, even if the range covered the entire data length
+                        // We were accidentally sending back 404 before in this situation
+                        // https://issues.apache.org/bugzilla/show_bug.cgi?id=51878 supports sending 206 even if the
+                        // entire range is requested, and viewer 3.2.2 (and very probably earlier) seems fine with this.
+                        response.StatusCode = (int)System.Net.HttpStatusCode.PartialContent;
+
+                        response.ContentLength = len;
+                        response.ContentType = texture.Metadata.ContentType;
+                        response.AddHeader("Content-Range", String.Format("bytes {0}-{1}/{2}", start, end, texture.Data.Length));
+    
+                        response.Body.Write(texture.Data, start, len);
+                    }
+                }
+                else
+                {
+                    m_log.Warn("[GETTEXTURE]: Malformed Range header: " + range);
+                    response.StatusCode = (int)System.Net.HttpStatusCode.BadRequest;
+                }
+            }
+            else // JP2's or other formats
+            {
+                // Full content request
+                response.StatusCode = (int)System.Net.HttpStatusCode.OK;
+                response.ContentLength = texture.Data.Length;
+                if (format == DefaultFormat)
+                    response.ContentType = texture.Metadata.ContentType;
+                else
+                    response.ContentType = "image/" + format;
+                response.Body.Write(texture.Data, 0, texture.Data.Length);
+            }
+
+//            if (response.StatusCode < 200 || response.StatusCode > 299)
+//                m_log.WarnFormat(
+//                    "[GETTEXTURE]: For texture {0} requested range {1} responded {2} with content length {3} (actual {4})",
+//                    texture.FullID, range, response.StatusCode, response.ContentLength, texture.Data.Length);
+//            else
+//                m_log.DebugFormat(
+//                    "[GETTEXTURE]: For texture {0} requested range {1} responded {2} with content length {3} (actual {4})",
+//                    texture.FullID, range, response.StatusCode, response.ContentLength, texture.Data.Length);
+        }
+
+        private bool TryParseRange(string header, out int start, out int end)
+        {
+            if (header.StartsWith("bytes="))
+            {
+                string[] rangeValues = header.Substring(6).Split('-');
+                if (rangeValues.Length == 2)
+                {
+                    if (Int32.TryParse(rangeValues[0], out start) && Int32.TryParse(rangeValues[1], out end))
+                        return true;
+                }
+            }
+
+            start = end = 0;
+            return false;
+        }
+
+        private byte[] ConvertTextureData(AssetBase texture, string format)
+        {
+            m_log.DebugFormat("[GETTEXTURE]: Converting texture {0} to {1}", texture.ID, format);
+            byte[] data = new byte[0];
+
+            MemoryStream imgstream = new MemoryStream();
+            Bitmap mTexture = new Bitmap(1, 1);
+            ManagedImage managedImage;
+            Image image = (Image)mTexture;
+
+            try
+            {
+                // Taking our jpeg2000 data, decoding it, then saving it to a byte array with regular data
+
+                imgstream = new MemoryStream();
+
+                // Decode image to System.Drawing.Image
+                if (OpenJPEG.DecodeToImage(texture.Data, out managedImage, out image))
+                {
+                    // Save to bitmap
+                    mTexture = new Bitmap(image);
+
+                    EncoderParameters myEncoderParameters = new EncoderParameters();
+                    myEncoderParameters.Param[0] = new EncoderParameter(Encoder.Quality, 95L);
+
+                    // Save bitmap to stream
+                    ImageCodecInfo codec = GetEncoderInfo("image/" + format);
+                    if (codec != null)
+                    {
+                        mTexture.Save(imgstream, codec, myEncoderParameters);
+                        // Write the stream to a byte array for output
+                        data = imgstream.ToArray();
+                    }
+                    else
+                        m_log.WarnFormat("[GETTEXTURE]: No such codec {0}", format);
+
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.WarnFormat("[GETTEXTURE]: Unable to convert texture {0} to {1}: {2}", texture.ID, format, e.Message);
+            }
+            finally
+            {
+                // Reclaim memory, these are unmanaged resources
+                // If we encountered an exception, one or more of these will be null
+                if (mTexture != null)
+                    mTexture.Dispose();
+
+                if (image != null)
+                    image.Dispose();
+
+                if (imgstream != null)
+                {
+                    imgstream.Close();
+                    imgstream.Dispose();
+                }
+            }
+
+            return data;
+        }
+
+        // From msdn
+        private static ImageCodecInfo GetEncoderInfo(String mimeType)
+        {
+            ImageCodecInfo[] encoders;
+            encoders = ImageCodecInfo.GetImageEncoders();
+            for (int j = 0; j < encoders.Length; ++j)
+            {
+                if (encoders[j].MimeType == mimeType)
+                    return encoders[j];
+            }
+            return null;
+        }
+    }
+}
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using Nini.Config;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Server.Handlers.Base;
+using OpenMetaverse;
+
+namespace OpenSim.Capabilities.Handlers
+{
+    public class GetTextureServerConnector : ServiceConnector
+    {
+        private IAssetService m_AssetService;
+        private string m_ConfigName = "CapsService";
+
+        public GetTextureServerConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
+        {
+            if (configName != String.Empty)
+                m_ConfigName = configName;
+
+            IConfig serverConfig = config.Configs[m_ConfigName];
+            if (serverConfig == null)
+                throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
+
+            string assetService = serverConfig.GetString("AssetService", String.Empty);
+
+            if (assetService == String.Empty)
+                throw new Exception("No AssetService in config file");
+
+            Object[] args = new Object[] { config };
+            m_AssetService =
+                    ServerUtils.LoadPlugin<IAssetService>(assetService, args);
+
+            if (m_AssetService == null)
+                throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName));
+
+            server.AddStreamHandler(new GetTextureHandler("/CAPS/GetTexture/" /*+ UUID.Random() */, m_AssetService));
+        }
+
+    }
+}
--- a/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs
@@ -25,48 +25,39 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-using Nini.Config;
-using log4net;
 using System;
-using System.IO;
-using System.Reflection;
+using System.Collections.Generic;
 using System.Net;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Xml;
-using System.Xml.Serialization;
-using OpenSim.Server.Base;
-using OpenSim.Services.Interfaces;
+using log4net;
+using log4net.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Capabilities.Handlers;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;

-namespace OpenSim.Server.Handlers.Freeswitch
+namespace OpenSim.Capabilities.Handlers.GetTexture.Tests
 {
-    public class FreeswitchServerGetHandler : BaseStreamHandler
+    [TestFixture]
+    public class GetTextureHandlerTests
    {
-        // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        //private IFreeswitchService m_FreeswitchService;
-
-        public FreeswitchServerGetHandler(IFreeswitchService service) :
-                base("GET", "/api")
+        [Test]
+        public void TestTextureNotFound()
        {
-            //m_FreeswitchService = service;
-        }
+            TestHelpers.InMethod();

-        public override byte[] Handle(string path, Stream request,
-                OSHttpRequest httpRequest, OSHttpResponse httpResponse)
-        {
-            byte[] result = new byte[0];
+            // Overkill - we only really need the asset service, not a whole scene.
+            Scene scene = SceneHelpers.SetupScene();

-            string[] p = SplitParams(path);
-
-            if (p.Length == 0)
-                return result;
-
-            // Process web request
-
-            return result;
+            GetTextureHandler handler = new GetTextureHandler(null, scene.AssetService);
+            TestOSHttpRequest req = new TestOSHttpRequest();
+            TestOSHttpResponse resp = new TestOSHttpResponse();
+            req.Url = new Uri("http://localhost/?texture_id=00000000-0000-1111-9999-000000000012");
+            handler.Handle(null, null, req, resp);
+            Assert.That(resp.StatusCode, Is.EqualTo((int)System.Net.HttpStatusCode.NotFound));
        }
    }
-}
+}
--- a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Reflection;
+using System.IO;
+using System.Web;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenMetaverse.Imaging;
+using OpenSim.Framework;
+using OpenSim.Framework.Capabilities;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Services.Interfaces;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+
+namespace OpenSim.Capabilities.Handlers
+{
+    public class UploadBakedTextureHandler
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private Caps m_HostCapsObj;
+        private IAssetService m_assetService;
+        private bool m_persistBakedTextures;
+
+        public UploadBakedTextureHandler(Caps caps, IAssetService assetService, bool persistBakedTextures)
+        {
+            m_HostCapsObj = caps;
+            m_assetService = assetService;
+            m_persistBakedTextures = persistBakedTextures;
+        }
+
+        /// <summary>
+        /// Handle a request from the client for a Uri to upload a baked texture.
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="path"></param>
+        /// <param name="param"></param>
+        /// <param name="httpRequest"></param>
+        /// <param name="httpResponse"></param>
+        /// <returns>The upload response if the request is successful, null otherwise.</returns>
+        public string UploadBakedTexture(
+            string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        {
+            try
+            {
+                string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath;
+                string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
+
+                BakedTextureUploader uploader =
+                    new BakedTextureUploader(capsBase + uploaderPath, m_HostCapsObj.HttpListener);
+                uploader.OnUpLoad += BakedTextureUploaded;
+
+                m_HostCapsObj.HttpListener.AddStreamHandler(
+                        new BinaryStreamHandler("POST", capsBase + uploaderPath,
+                        uploader.uploaderCaps));
+
+                string protocol = "http://";
+
+                if (m_HostCapsObj.SSLCaps)
+                    protocol = "https://";
+
+                string uploaderURL = protocol + m_HostCapsObj.HostName + ":" +
+                        m_HostCapsObj.Port.ToString() + capsBase + uploaderPath;
+
+                LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse();
+                uploadResponse.uploader = uploaderURL;
+                uploadResponse.state = "upload";
+
+                return LLSDHelpers.SerialiseLLSDReply(uploadResponse);
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[UPLOAD BAKED TEXTURE HANDLER]: {0}{1}", e.Message, e.StackTrace);
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Called when a baked texture has been successfully uploaded by a client.
+        /// </summary>
+        /// <param name="assetID"></param>
+        /// <param name="data"></param>
+        private void BakedTextureUploaded(UUID assetID, byte[] data)
+        {
+//            m_log.DebugFormat("[UPLOAD BAKED TEXTURE HANDLER]: Received baked texture {0}", assetID.ToString());
+
+            AssetBase asset;
+            asset = new AssetBase(assetID, "Baked Texture", (sbyte)AssetType.Texture, m_HostCapsObj.AgentID.ToString());
+            asset.Data = data;
+            asset.Temporary = true;
+            asset.Local = !m_persistBakedTextures; // Local assets aren't persisted, non-local are
+            m_assetService.Store(asset);
+        }
+    }
+
+    class BakedTextureUploader
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public event Action<UUID, byte[]> OnUpLoad;
+
+        private string uploaderPath = String.Empty;
+        private UUID newAssetID;
+        private IHttpServer httpListener;
+
+        public BakedTextureUploader(string path, IHttpServer httpServer)
+        {
+            newAssetID = UUID.Random();
+            uploaderPath = path;
+            httpListener = httpServer;
+            //                m_log.InfoFormat("[CAPS] baked texture upload starting for {0}",newAssetID);
+        }
+
+        /// <summary>
+        /// Handle raw uploaded baked texture data.
+        /// </summary>
+        /// <param name="data"></param>
+        /// <param name="path"></param>
+        /// <param name="param"></param>
+        /// <returns></returns>
+        public string uploaderCaps(byte[] data, string path, string param)
+        {
+            Action<UUID, byte[]> handlerUpLoad = OnUpLoad;
+
+            // Don't do this asynchronously, otherwise it's possible for the client to send set appearance information
+            // on another thread which might send out avatar updates before the asset has been put into the asset
+            // service.
+            if (handlerUpLoad != null)
+                handlerUpLoad(newAssetID, data);
+
+            string res = String.Empty;
+            LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
+            uploadComplete.new_asset = newAssetID.ToString();
+            uploadComplete.new_inventory_item = UUID.Zero;
+            uploadComplete.state = "complete";
+
+            res = LLSDHelpers.SerialiseLLSDReply(uploadComplete);
+
+            httpListener.RemoveStreamHandler("POST", uploaderPath);
+
+//            m_log.DebugFormat("[BAKED TEXTURE UPLOADER]: baked texture upload completed for {0}", newAssetID);
+
+            return res;
+        }
+    }
+}
--- a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
+++ b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
@@ -0,0 +1,412 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+using OpenSim.Framework.Capabilities;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Services.Interfaces;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+
+namespace OpenSim.Capabilities.Handlers
+{
+    public class WebFetchInvDescHandler 
+    {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private IInventoryService m_InventoryService;
+        private ILibraryService m_LibraryService;
+//        private object m_fetchLock = new Object();
+
+        public WebFetchInvDescHandler(IInventoryService invService, ILibraryService libService) 
+        {
+            m_InventoryService = invService;
+            m_LibraryService = libService;
+        }
+
+        public string FetchInventoryDescendentsRequest(string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        {
+//            lock (m_fetchLock)
+//            {
+//                m_log.DebugFormat("[WEB FETCH INV DESC HANDLER]: Received request {0}", request);
+    
+                // nasty temporary hack here, the linden client falsely
+                // identifies the uuid 00000000-0000-0000-0000-000000000000
+                // as a string which breaks us
+                //
+                // correctly mark it as a uuid
+                //
+                request = request.Replace("<string>00000000-0000-0000-0000-000000000000</string>", "<uuid>00000000-0000-0000-0000-000000000000</uuid>");
+    
+                // another hack <integer>1</integer> results in a
+                // System.ArgumentException: Object type System.Int32 cannot
+                // be converted to target type: System.Boolean
+                //
+                request = request.Replace("<key>fetch_folders</key><integer>0</integer>", "<key>fetch_folders</key><boolean>0</boolean>");
+                request = request.Replace("<key>fetch_folders</key><integer>1</integer>", "<key>fetch_folders</key><boolean>1</boolean>");
+    
+                Hashtable hash = new Hashtable();
+                try
+                {
+                    hash = (Hashtable)LLSD.LLSDDeserialize(Utils.StringToBytes(request));
+                }
+                catch (LLSD.LLSDParseException e)
+                {
+                    m_log.ErrorFormat("[WEB FETCH INV DESC HANDLER]: Fetch error: {0}{1}" + e.Message, e.StackTrace);
+                    m_log.Error("Request: " + request);
+                }
+    
+                ArrayList foldersrequested = (ArrayList)hash["folders"];
+    
+                string response = "";
+
+                for (int i = 0; i < foldersrequested.Count; i++)
+                {
+                    string inventoryitemstr = "";
+                    Hashtable inventoryhash = (Hashtable)foldersrequested[i];
+
+                    LLSDFetchInventoryDescendents llsdRequest = new LLSDFetchInventoryDescendents();
+
+                    try
+                    {
+                        LLSDHelpers.DeserialiseOSDMap(inventoryhash, llsdRequest);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Debug("[WEB FETCH INV DESC HANDLER]: caught exception doing OSD deserialize" + e);
+                    }
+                    LLSDInventoryDescendents reply = FetchInventoryReply(llsdRequest);
+
+                    inventoryitemstr = LLSDHelpers.SerialiseLLSDReply(reply);
+                    inventoryitemstr = inventoryitemstr.Replace("<llsd><map><key>folders</key><array>", "");
+                    inventoryitemstr = inventoryitemstr.Replace("</array></map></llsd>", "");
+
+                    response += inventoryitemstr;
+                }
+
+                if (response.Length == 0)
+                {
+                    // Ter-guess: If requests fail a lot, the client seems to stop requesting descendants.
+                    // Therefore, I'm concluding that the client only has so many threads available to do requests
+                    // and when a thread stalls..   is stays stalled.
+                    // Therefore we need to return something valid
+                    response = "<llsd><map><key>folders</key><array /></map></llsd>";
+                }
+                else
+                {
+                    response = "<llsd><map><key>folders</key><array>" + response + "</array></map></llsd>";
+                }
+
+//                m_log.DebugFormat("[WEB FETCH INV DESC HANDLER]: Replying to CAPS fetch inventory request");
+                //m_log.Debug("[WEB FETCH INV DESC HANDLER] "+response);
+
+                return response;
+
+//            }
+        }
+
+        /// <summary>
+        /// Construct an LLSD reply packet to a CAPS inventory request
+        /// </summary>
+        /// <param name="invFetch"></param>
+        /// <returns></returns>
+        private LLSDInventoryDescendents FetchInventoryReply(LLSDFetchInventoryDescendents invFetch)
+        {
+            LLSDInventoryDescendents reply = new LLSDInventoryDescendents();
+            LLSDInventoryFolderContents contents = new LLSDInventoryFolderContents();
+            contents.agent_id = invFetch.owner_id;
+            contents.owner_id = invFetch.owner_id;
+            contents.folder_id = invFetch.folder_id;
+
+            reply.folders.Array.Add(contents);
+            InventoryCollection inv = new InventoryCollection();
+            inv.Folders = new List<InventoryFolderBase>();
+            inv.Items = new List<InventoryItemBase>();
+            int version = 0;
+
+            inv
+                = Fetch(
+                    invFetch.owner_id, invFetch.folder_id, invFetch.owner_id,
+                    invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order, out version);
+
+            if (inv.Folders != null)
+            {
+                foreach (InventoryFolderBase invFolder in inv.Folders)
+                {
+                    contents.categories.Array.Add(ConvertInventoryFolder(invFolder));
+                }
+            }
+
+            if (inv.Items != null)
+            {
+                foreach (InventoryItemBase invItem in inv.Items)
+                {
+                    contents.items.Array.Add(ConvertInventoryItem(invItem));
+                }
+            }
+
+            contents.descendents = contents.items.Array.Count + contents.categories.Array.Count;
+            contents.version = version;
+
+//            m_log.DebugFormat(
+//                "[WEB FETCH INV DESC HANDLER]: Replying to request for folder {0} (fetch items {1}, fetch folders {2}) with {3} items and {4} folders for agent {5}",
+//                invFetch.folder_id,
+//                invFetch.fetch_items,
+//                invFetch.fetch_folders,
+//                contents.items.Array.Count,
+//                contents.categories.Array.Count,
+//                invFetch.owner_id);
+
+            return reply;
+        }
+
+        /// <summary>
+        /// Handle the caps inventory descendents fetch.
+        /// </summary>
+        /// <param name="agentID"></param>
+        /// <param name="folderID"></param>
+        /// <param name="ownerID"></param>
+        /// <param name="fetchFolders"></param>
+        /// <param name="fetchItems"></param>
+        /// <param name="sortOrder"></param>
+        /// <param name="version"></param>
+        /// <returns>An empty InventoryCollection if the inventory look up failed</returns>
+        private InventoryCollection Fetch(
+            UUID agentID, UUID folderID, UUID ownerID,
+            bool fetchFolders, bool fetchItems, int sortOrder, out int version)
+        {
+//            m_log.DebugFormat(
+//                "[WEB FETCH INV DESC HANDLER]: Fetching folders ({0}), items ({1}) from {2} for agent {3}",
+//                fetchFolders, fetchItems, folderID, agentID);
+
+            // FIXME MAYBE: We're not handling sortOrder!
+
+            version = 0;
+            InventoryFolderImpl fold;
+            if (m_LibraryService != null && m_LibraryService.LibraryRootFolder != null && agentID == m_LibraryService.LibraryRootFolder.Owner)
+            {
+                if ((fold = m_LibraryService.LibraryRootFolder.FindFolder(folderID)) != null)
+                {
+                    InventoryCollection ret = new InventoryCollection();
+                    ret.Folders = new List<InventoryFolderBase>();
+                    ret.Items = fold.RequestListOfItems();
+
+                    return ret;
+                }
+            }
+
+            InventoryCollection contents = new InventoryCollection();
+
+            if (folderID != UUID.Zero)
+            {
+                contents = m_InventoryService.GetFolderContent(agentID, folderID);
+                InventoryFolderBase containingFolder = new InventoryFolderBase();
+                containingFolder.ID = folderID;
+                containingFolder.Owner = agentID;
+                containingFolder = m_InventoryService.GetFolder(containingFolder);
+
+                if (containingFolder != null)
+                {
+//                    m_log.DebugFormat(
+//                        "[WEB FETCH INV DESC HANDLER]: Retrieved folder {0} {1} for agent id {2}",
+//                        containingFolder.Name, containingFolder.ID, agentID);
+
+                    version = containingFolder.Version;
+
+//                    if (fetchItems)
+//                    {
+//                        List<InventoryItemBase> linkedItemsToAdd = new List<InventoryItemBase>();
+//
+//                        foreach (InventoryItemBase item in contents.Items)
+//                        {
+//                            if (item.AssetType == (int)AssetType.Link)
+//                            {
+//                                InventoryItemBase linkedItem = m_InventoryService.GetItem(new InventoryItemBase(item.AssetID));
+//
+//                                // Take care of genuinely broken links where the target doesn't exist
+//                                // HACK: Also, don't follow up links that just point to other links.  In theory this is legitimate,
+//                                // but no viewer has been observed to set these up and this is the lazy way of avoiding cycles
+//                                // rather than having to keep track of every folder requested in the recursion.
+//                                if (linkedItem != null && linkedItem.AssetType != (int)AssetType.Link)
+//                                    linkedItemsToAdd.Insert(0, linkedItem);
+//                            }
+//                        }
+//
+//                        foreach (InventoryItemBase linkedItem in linkedItemsToAdd)
+//                        {
+//                            m_log.DebugFormat(
+//                                "[WEB FETCH INV DESC HANDLER]: Inserted linked item {0} for link in folder {1} for agent {2}",
+//                                linkedItem.Name, folderID, agentID);
+//
+//                            contents.Items.Add(linkedItem);
+//                        }
+//
+//                        // If the folder requested contains links, then we need to send those folders first, otherwise the links
+//                        // will be broken in the viewer.
+//                        HashSet<UUID> linkedItemFolderIdsToSend = new HashSet<UUID>();
+//                        foreach (InventoryItemBase item in contents.Items)
+//                        {
+//                            if (item.AssetType == (int)AssetType.Link)
+//                            {
+//                                InventoryItemBase linkedItem = m_InventoryService.GetItem(new InventoryItemBase(item.AssetID));
+//
+//                                // Take care of genuinely broken links where the target doesn't exist
+//                                // HACK: Also, don't follow up links that just point to other links.  In theory this is legitimate,
+//                                // but no viewer has been observed to set these up and this is the lazy way of avoiding cycles
+//                                // rather than having to keep track of every folder requested in the recursion.
+//                                if (linkedItem != null && linkedItem.AssetType != (int)AssetType.Link)
+//                                {
+//                                    // We don't need to send the folder if source and destination of the link are in the same
+//                                    // folder.
+//                                    if (linkedItem.Folder != containingFolder.ID)
+//                                        linkedItemFolderIdsToSend.Add(linkedItem.Folder);
+//                                }
+//                            }
+//                        }
+//    
+//                        foreach (UUID linkedItemFolderId in linkedItemFolderIdsToSend)
+//                        {
+//                            m_log.DebugFormat(
+//                                "[WEB FETCH INV DESC HANDLER]: Recursively fetching folder {0} linked by item in folder {1} for agent {2}",
+//                                linkedItemFolderId, folderID, agentID);
+//
+//                            int dummyVersion;
+//                            InventoryCollection linkedCollection
+//                                = Fetch(
+//                                    agentID, linkedItemFolderId, ownerID, fetchFolders, fetchItems, sortOrder, out dummyVersion);
+//
+//                            InventoryFolderBase linkedFolder = new InventoryFolderBase(linkedItemFolderId);
+//                            linkedFolder.Owner = agentID;
+//                            linkedFolder = m_InventoryService.GetFolder(linkedFolder);
+//
+////                            contents.Folders.AddRange(linkedCollection.Folders);
+//
+//                            contents.Folders.Add(linkedFolder);
+//                            contents.Items.AddRange(linkedCollection.Items);
+//                        }
+//                    }
+                }
+            }
+            else
+            {
+                // Lost items don't really need a version
+                version = 1;
+            }
+
+            return contents;
+
+        }
+        /// <summary>
+        /// Convert an internal inventory folder object into an LLSD object.
+        /// </summary>
+        /// <param name="invFolder"></param>
+        /// <returns></returns>
+        private LLSDInventoryFolder ConvertInventoryFolder(InventoryFolderBase invFolder)
+        {
+            LLSDInventoryFolder llsdFolder = new LLSDInventoryFolder();
+            llsdFolder.folder_id = invFolder.ID;
+            llsdFolder.parent_id = invFolder.ParentID;
+            llsdFolder.name = invFolder.Name;
+
+            if (invFolder.Type == (short)AssetType.Unknown || !Enum.IsDefined(typeof(AssetType), (sbyte)invFolder.Type))
+                llsdFolder.type = "-1";
+            else
+                llsdFolder.type = Utils.AssetTypeToString((AssetType)invFolder.Type);
+            llsdFolder.preferred_type = "-1";
+
+            return llsdFolder;
+        }
+
+        /// <summary>
+        /// Convert an internal inventory item object into an LLSD object.
+        /// </summary>
+        /// <param name="invItem"></param>
+        /// <returns></returns>
+        private LLSDInventoryItem ConvertInventoryItem(InventoryItemBase invItem)
+        {
+            LLSDInventoryItem llsdItem = new LLSDInventoryItem();
+            llsdItem.asset_id = invItem.AssetID;
+            llsdItem.created_at = invItem.CreationDate;
+            llsdItem.desc = invItem.Description;
+            llsdItem.flags = (int)invItem.Flags;
+            llsdItem.item_id = invItem.ID;
+            llsdItem.name = invItem.Name;
+            llsdItem.parent_id = invItem.Folder;
+
+            try
+            {
+                llsdItem.type = Utils.AssetTypeToString((AssetType)invItem.AssetType);
+                llsdItem.inv_type = Utils.InventoryTypeToString((InventoryType)invItem.InvType);
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat(
+                    "[WEB FETCH INV DESC HANDLER]: Problem setting asset {0} inventory {1} types while converting inventory item {2}: {3}",
+                    invItem.AssetType, invItem.InvType, invItem.Name, e.Message);
+            }
+
+            llsdItem.permissions = new LLSDPermissions();
+            llsdItem.permissions.creator_id = invItem.CreatorIdAsUuid;
+            llsdItem.permissions.base_mask = (int)invItem.CurrentPermissions;
+            llsdItem.permissions.everyone_mask = (int)invItem.EveryOnePermissions;
+            llsdItem.permissions.group_id = invItem.GroupID;
+            llsdItem.permissions.group_mask = (int)invItem.GroupPermissions;
+            llsdItem.permissions.is_owner_group = invItem.GroupOwned;
+            llsdItem.permissions.next_owner_mask = (int)invItem.NextPermissions;
+            llsdItem.permissions.owner_id = invItem.Owner;
+            llsdItem.permissions.owner_mask = (int)invItem.CurrentPermissions;
+            llsdItem.sale_info = new LLSDSaleInfo();
+            llsdItem.sale_info.sale_price = invItem.SalePrice;
+            switch (invItem.SaleType)
+            {
+                default:
+                    llsdItem.sale_info.sale_type = "not";
+                    break;
+                case 1:
+                    llsdItem.sale_info.sale_type = "original";
+                    break;
+                case 2:
+                    llsdItem.sale_info.sale_type = "copy";
+                    break;
+                case 3:
+                    llsdItem.sale_info.sale_type = "contents";
+                    break;
+            }
+
+            return llsdItem;
+        }
+    }
+}
--- a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescServerConnector.cs
+++ b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescServerConnector.cs
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using Nini.Config;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Server.Handlers.Base;
+using OpenMetaverse;
+
+namespace OpenSim.Capabilities.Handlers
+{
+    public class WebFetchInvDescServerConnector : ServiceConnector
+    {
+        private IInventoryService m_InventoryService;
+        private ILibraryService m_LibraryService;
+        private string m_ConfigName = "CapsService";
+
+        public WebFetchInvDescServerConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
+        {
+            if (configName != String.Empty)
+                m_ConfigName = configName;
+
+            IConfig serverConfig = config.Configs[m_ConfigName];
+            if (serverConfig == null)
+                throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
+
+            string invService = serverConfig.GetString("InventoryService", String.Empty);
+
+            if (invService == String.Empty)
+                throw new Exception("No InventoryService in config file");
+
+            Object[] args = new Object[] { config };
+            m_InventoryService =
+                    ServerUtils.LoadPlugin<IInventoryService>(invService, args);
+
+            if (m_InventoryService == null)
+                throw new Exception(String.Format("Failed to load InventoryService from {0}; config is {1}", invService, m_ConfigName));
+
+            string libService = serverConfig.GetString("LibraryService", String.Empty);
+            m_LibraryService =
+                    ServerUtils.LoadPlugin<ILibraryService>(libService, args);
+
+            WebFetchInvDescHandler webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService);
+            IRequestHandler reqHandler = new RestStreamHandler("POST", "/CAPS/WebFetchInvDesc/" /*+ UUID.Random()*/, webFetchHandler.FetchInventoryDescendentsRequest);
+            server.AddStreamHandler(reqHandler);
+        }
+
+    }
+}
--- a/OpenSim/Framework/Capabilities/LLSD.cs
+++ b/OpenSim/Framework/Capabilities/LLSD.cs
--- a/OpenSim/Framework/Capabilities/LLSDArray.cs
+++ b/OpenSim/Framework/Capabilities/LLSDArray.cs
--- a/OpenSim/Framework/Capabilities/LLSDAssetUploadComplete.cs
+++ b/OpenSim/Framework/Capabilities/LLSDAssetUploadComplete.cs
--- a/OpenSim/Framework/Capabilities/LLSDAssetUploadRequest.cs
+++ b/OpenSim/Framework/Capabilities/LLSDAssetUploadRequest.cs
--- a/OpenSim/Framework/Capabilities/LLSDAssetUploadResponse.cs
+++ b/OpenSim/Framework/Capabilities/LLSDAssetUploadResponse.cs
@@ -39,4 +39,18 @@ namespace OpenSim.Framework.Capabilities
        {
        }
    }
+
+    [OSDMap]
+    public class LLSDNewFileAngentInventoryVariablePriceReplyResponse
+    {
+        public int resource_cost;
+        public string state;
+        public int upload_price;
+        public string rsvp;
+        
+        public LLSDNewFileAngentInventoryVariablePriceReplyResponse()
+        {
+            state = "confirm_upload";
+        }
+    }
 }
--- a/OpenSim/Framework/Capabilities/LLSDCapEvent.cs
+++ b/OpenSim/Framework/Capabilities/LLSDCapEvent.cs
--- a/OpenSim/Framework/Capabilities/LLSDEmpty.cs
+++ b/OpenSim/Framework/Capabilities/LLSDEmpty.cs
--- a/OpenSim/Framework/Capabilities/LLSDHelpers.cs
+++ b/OpenSim/Framework/Capabilities/LLSDHelpers.cs
--- a/OpenSim/Framework/Capabilities/LLSDInventoryFolder.cs
+++ b/OpenSim/Framework/Capabilities/LLSDInventoryFolder.cs
--- a/OpenSim/Framework/Capabilities/LLSDInventoryItem.cs
+++ b/OpenSim/Framework/Capabilities/LLSDInventoryItem.cs
@@ -95,4 +95,11 @@ namespace OpenSim.Framework.Capabilities
        public UUID owner_id; 
        public int version;
    }
-}
+
+    [OSDMap]
+    public class LLSDFetchInventory
+    {
+        public UUID agent_id;
+        public OSDArray items = new OSDArray();
+    }
+}
--- a/OpenSim/Framework/Capabilities/LLSDItemUpdate.cs
+++ b/OpenSim/Framework/Capabilities/LLSDItemUpdate.cs
--- a/OpenSim/Framework/Capabilities/LLSDMapLayer.cs
+++ b/OpenSim/Framework/Capabilities/LLSDMapLayer.cs
--- a/OpenSim/Framework/Capabilities/LLSDMapLayerResponse.cs
+++ b/OpenSim/Framework/Capabilities/LLSDMapLayerResponse.cs
--- a/OpenSim/Framework/Capabilities/LLSDMapRequest.cs
+++ b/OpenSim/Framework/Capabilities/LLSDMapRequest.cs
--- a/OpenSim/Framework/Capabilities/LLSDMethod.cs
+++ b/OpenSim/Framework/Capabilities/LLSDMethod.cs
--- a/OpenSim/Framework/Capabilities/LLSDMethodString.cs
+++ b/OpenSim/Framework/Capabilities/LLSDMethodString.cs
--- a/OpenSim/Framework/Capabilities/LLSDParcelVoiceInfoResponse.cs
+++ b/OpenSim/Framework/Capabilities/LLSDParcelVoiceInfoResponse.cs
--- a/OpenSim/Framework/Capabilities/LLSDRemoteParcelResponse.cs
+++ b/OpenSim/Framework/Capabilities/LLSDRemoteParcelResponse.cs
--- a/OpenSim/Framework/Capabilities/LLSDStreamHandler.cs
+++ b/OpenSim/Framework/Capabilities/LLSDStreamHandler.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Framework.Capabilities
        }

        public override byte[] Handle(string path, Stream request,
-                                      OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                                      IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
        {
            //Encoding encoding = Util.UTF8;
            //StreamReader streamReader = new StreamReader(request, false);
--- a/OpenSim/Framework/Capabilities/LLSDTaskInventoryUploadComplete.cs
+++ b/OpenSim/Framework/Capabilities/LLSDTaskInventoryUploadComplete.cs
--- a/OpenSim/Framework/Capabilities/LLSDTaskScriptUpdate.cs
+++ b/OpenSim/Framework/Capabilities/LLSDTaskScriptUpdate.cs
--- a/OpenSim/Framework/Capabilities/LLSDTaskScriptUploadComplete.cs
+++ b/OpenSim/Framework/Capabilities/LLSDTaskScriptUploadComplete.cs
--- a/OpenSim/Framework/Capabilities/LLSDTest.cs
+++ b/OpenSim/Framework/Capabilities/LLSDTest.cs
--- a/OpenSim/Framework/Capabilities/LLSDType.cs
+++ b/OpenSim/Framework/Capabilities/LLSDType.cs
--- a/OpenSim/Framework/Capabilities/LLSDVoiceAccountResponse.cs
+++ b/OpenSim/Framework/Capabilities/LLSDVoiceAccountResponse.cs
--- a/OpenSim/Client/Linden/Resources/LindenModules.addin.xml
+++ b/OpenSim/Client/Linden/Resources/LindenModules.addin.xml
@@ -1,13 +0,0 @@
-<Addin id="OpenSim.Client.Linden.LindenModules" version="0.2">
-    <Runtime>
-        <Import assembly="OpenSim.Client.Linden.dll"/>
-    </Runtime>
-
-    <Dependencies>
-        <Addin id="OpenSim" version="0.5" />
-    </Dependencies>
-
-    <Extension path = "/OpenSim/RegionModules">
-        <RegionModule id="LLClientStackModule" type="OpenSim.Client.Linden.LLClientStackModule" />
-    </Extension>
-</Addin>
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
--- a/OpenSim/Client/MXP/MXPModule.cs
+++ b/OpenSim/Client/MXP/MXPModule.cs
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Text;
-using System.Timers;
-using log4net;
-using MXP;
-using Nini.Config;
-using OpenMetaverse;
-using OpenSim.Client.MXP.PacketHandler;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
-namespace OpenSim.Client.MXP
-{
-
-    /**
-     * MXP Client Module which adds MXP support to client / region communication.
-     */
-    public class MXPModule : IRegionModule
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private MXPPacketServer m_server;
-
-        private IConfigSource m_config;
-        private int m_port = 1253;
-        private Timer m_ticker;
-
-        private readonly Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>();
-        private bool m_shutdown;
-
-        public void Initialise(Scene scene, IConfigSource source)
-        {
-            if (!m_scenes.ContainsKey(scene.RegionInfo.RegionID))
-                m_scenes.Add(scene.RegionInfo.RegionID, scene);
-
-            m_config = source;
-        }
-
-        public void PostInitialise()
-        {
-            if (m_config.Configs["MXP"] != null)
-            {
-                IConfig con = m_config.Configs["MXP"];
-
-                if (!con.GetBoolean("Enabled", false))
-                    return;
-
-                m_port = con.GetInt("Port", m_port);
-
-                m_server = new MXPPacketServer(m_port, m_scenes,m_config.Configs["StandAlone"].GetBoolean("accounts_authenticate",true));
-
-                m_ticker = new Timer(100);
-                m_ticker.AutoReset = false;
-                m_ticker.Elapsed += ticker_Elapsed;
-
-                lock (m_ticker)
-                    m_ticker.Start();
-
-                m_log.Info("[MXP ClientStack] MXP Enabled and Listening");
-            }
-        }
-
-        void ticker_Elapsed(object sender, ElapsedEventArgs e)
-        {
-            try
-            {
-                m_server.Process();
-            }
-            catch (Exception ex)
-            {
-                m_log.Error("[MXP ClientStack]: Unhandled exception in process loop: " + ex.ToString() + " :" + ex.StackTrace.ToString());
-            }
-
-            if (!m_shutdown)
-            {
-                lock (m_ticker)
-                    m_ticker.Start();
-            }
-        }
-
-        public void Close()
-        {
-            m_shutdown = true;
-            if (m_ticker != null)
-            {
-                lock (m_ticker)
-                    m_ticker.Stop();
-            }
-        }
-
-        public string Name
-        {
-            get { return "MXP ClientStack Module"; }
-        }
-
-        public bool IsSharedModule
-        {
-            get { return true; }
-        }
-
-    }
-}
--- a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
+++ b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
@@ -1,564 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* This file borrows heavily from MXPServer.cs - the reference MXPServer 
- * See http://www.bubblecloud.org for a copy of the original file and
- * implementation details. */
-
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Threading;
-using log4net;
-using MXP;
-using MXP.Messages;
-using OpenMetaverse;
-using OpenSim.Client.MXP.ClientStack;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Framework.Communications;
-using OpenSim.Services.Interfaces;
-using System.Security.Cryptography;
-
-namespace OpenSim.Client.MXP.PacketHandler
-{
-    public class MXPPacketServer
-    {
-        internal static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        #region Fields
-
-        private readonly List<MXPClientView> m_clients = new List<MXPClientView>();
-        private readonly Dictionary<UUID, Scene> m_scenes;
-        private readonly Transmitter m_transmitter;
-
-//        private readonly Thread m_clientThread;
-
-        private readonly IList<Session> m_sessions = new List<Session>();
-        private readonly IList<Session> m_sessionsToClient = new List<Session>();
-        private readonly IList<MXPClientView> m_sessionsToRemove = new List<MXPClientView>();
-
-        private readonly int m_port;
-        private readonly bool m_accountsAuthenticate;
-
-        private readonly String m_programName;
-        private readonly byte m_programMajorVersion;
-        private readonly byte m_programMinorVersion;
-
-        #endregion
-
-        #region Constructors
-
-        public MXPPacketServer(int port, Dictionary<UUID, Scene> scenes, bool accountsAuthenticate)
-        {
-            m_port = port;
-            m_accountsAuthenticate = accountsAuthenticate;
-
-            m_scenes = scenes;
-
-            m_programMinorVersion = 63;
-            m_programMajorVersion = 0;
-            m_programName = "OpenSimulator";
-
-            m_transmitter = new Transmitter(port);
-
-            StartListener();
-        }
-
-        public void StartListener()
-        {
-            m_log.Info("[MXP ClientStack] Transmitter starting on UDP server port: " + m_port);
-            m_transmitter.Startup();
-            m_log.Info("[MXP ClientStack] Transmitter started. MXP version: "+MxpConstants.ProtocolMajorVersion+"."+MxpConstants.ProtocolMinorVersion+" Source Revision: "+MxpConstants.ProtocolSourceRevision);
-        }
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Number of sessions pending. (Process() accepts pending sessions).
-        /// </summary>
-        public int PendingSessionCount
-        {
-            get
-            {
-                return m_transmitter.PendingSessionCount;
-            }
-        }
-        /// <summary>
-        /// Number of connected sessions.
-        /// </summary>
-        public int SessionCount
-        {
-            get
-            {
-                return m_sessions.Count;
-            }
-        }
-        /// <summary>
-        /// Property reflecting whether client transmitter threads are alive.
-        /// </summary>
-        public bool IsTransmitterAlive
-        {
-            get
-            {
-                return m_transmitter != null && m_transmitter.IsAlive;
-            }
-        }
-        /// <summary>
-        /// Number of packets sent.
-        /// </summary>
-        public ulong PacketsSent
-        {
-            get
-            {
-                return m_transmitter != null ? m_transmitter.PacketsSent : 0;
-            }
-        }
-        /// <summary>
-        /// Number of packets received.
-        /// </summary>
-        public ulong PacketsReceived
-        {
-            get
-            {
-                return m_transmitter != null ? m_transmitter.PacketsReceived : 0;
-            }
-        }
-        /// <summary>
-        /// Bytes client has received so far.
-        /// </summary>
-        public ulong BytesReceived
-        {
-            get
-            {
-                return m_transmitter != null ? m_transmitter.BytesReceived : 0;
-            }
-        }
-        /// <summary>
-        /// Bytes client has sent so far.
-        /// </summary>
-        public ulong BytesSent
-        {
-            get
-            {
-                return m_transmitter != null ? m_transmitter.BytesSent : 0;
-            }
-        }
-        /// <summary>
-        /// Number of bytes received (bytes per second) during past second.
-        /// </summary>
-        public double ReceiveRate
-        {
-            get
-            {
-                return m_transmitter != null ? m_transmitter.ReceiveRate : 0;
-            }
-        }
-        /// <summary>
-        /// Number of bytes sent (bytes per second) during past second.
-        /// </summary>
-        public double SendRate
-        {
-            get
-            {
-                return m_transmitter != null ? m_transmitter.SendRate : 0;
-            }
-        }
-
-        #endregion
-
-        #region Session Management
-
-        public void Disconnect(Session session)
-        {
-            if (session.IsConnected)
-            {
-                Message message = MessageFactory.Current.ReserveMessage(typeof(LeaveRequestMessage));
-                session.Send(message);
-                MessageFactory.Current.ReleaseMessage(message);
-            }
-            else
-            {
-                throw new Exception("Not connected.");
-            }
-        }
-
-        #endregion
-
-        #region Processing
-
-        public void Process()
-        {
-            ProcessMessages();
-            Clean();
-        }
-
-        public void Clean()
-        {
-            foreach (MXPClientView clientView in m_clients)
-            {
-                if (clientView.Session.SessionState == SessionState.Disconnected)
-                {
-                    m_sessionsToRemove.Add(clientView);
-                }
-            }
-
-            foreach (MXPClientView clientView in m_sessionsToRemove)
-            {
-                clientView.Scene.RemoveClient(clientView.AgentId);
-                clientView.OnClean();
-                m_clients.Remove(clientView);
-                m_sessions.Remove(clientView.Session);
-            }
-
-            m_sessionsToRemove.Clear();
-        }
-
-        public void ProcessMessages()
-        {
-            if (m_transmitter.PendingSessionCount > 0)
-            {
-                Session tmp = m_transmitter.AcceptPendingSession();
-                m_sessions.Add(tmp);
-                m_sessionsToClient.Add(tmp);
-
-            }
-
-            List<Session> tmpRemove = new List<Session>();
-
-            foreach (Session session in m_sessionsToClient)
-            {
-                while (session.AvailableMessages > 0)
-                {
-                    Message message = session.Receive();
-
-                    if (message.GetType() == typeof (JoinRequestMessage))
-                    {
-
-                        JoinRequestMessage joinRequestMessage = (JoinRequestMessage) message;
-
-                        m_log.Info("[MXP ClientStack]: Session join request: " + session.SessionId + " (" +
-                           (session.IsIncoming ? "from" : "to") + " " + session.RemoteEndPoint.Address + ":" +
-                            session.RemoteEndPoint.Port + ")");
-
-                        try
-                        {
-
-                            if (joinRequestMessage.BubbleId == Guid.Empty)
-                            {
-                                foreach (Scene scene in m_scenes.Values)
-                                {
-                                    if (scene.RegionInfo.RegionName == joinRequestMessage.BubbleName)
-                                    {
-                                        m_log.Info("[MXP ClientStack]: Resolved region by name: " + joinRequestMessage.BubbleName + " (" + scene.RegionInfo.RegionID + ")");
-                                        joinRequestMessage.BubbleId = scene.RegionInfo.RegionID.Guid;
-                                    }
-                                }
-                            }
-
-                            if (joinRequestMessage.BubbleId == Guid.Empty)
-                            {
-                                m_log.Warn("[MXP ClientStack]: Failed to resolve region by name: " + joinRequestMessage.BubbleName);
-                            }
-
-                            UUID sceneId = new UUID(joinRequestMessage.BubbleId);
-
-                            bool regionExists = true;
-                            if (!m_scenes.ContainsKey(sceneId))
-                            {
-                                m_log.Info("[MXP ClientStack]: No such region: " + sceneId);
-                                regionExists = false;
-                            }
-
-                            UUID userId = UUID.Zero;
-                            UserAccount account = null;
-                            bool authorized = regionExists ? AuthoriseUser(joinRequestMessage.ParticipantName,
-                                                            joinRequestMessage.ParticipantPassphrase,
-                                                            new UUID(joinRequestMessage.BubbleId), out account)
-                                                            : false;
-
-                            if (authorized)
-                            {
-                                Scene scene = m_scenes[sceneId];
-                                UUID mxpSessionID = UUID.Random();
-                                
-                                string reason;
-
-                                m_log.Debug("[MXP ClientStack]: Session join request success: " + session.SessionId + " (" +
-                                   (session.IsIncoming ? "from" : "to") + " " + session.RemoteEndPoint.Address + ":" +
-                                   session.RemoteEndPoint.Port + ")");
-
-                                m_log.Debug("[MXP ClientStack]: Attaching UserAgent to UserProfile...");
-                                UUID secureSession = UUID.Zero;
-                                AttachUserAgentToUserProfile(account, session, mxpSessionID, sceneId, out secureSession);
-                                m_log.Debug("[MXP ClientStack]: Attached UserAgent to UserProfile.");
-                                m_log.Debug("[MXP ClientStack]: Preparing Scene to Connection...");
-                                if (!PrepareSceneForConnection(mxpSessionID, secureSession, sceneId, account, out reason))
-                                {
-                                    m_log.DebugFormat("[MXP ClientStack]: Scene refused connection: {0}", reason);
-                                    DeclineConnection(session, joinRequestMessage);
-                                    tmpRemove.Add(session);
-                                    continue;
-                                }
-                                m_log.Debug("[MXP ClientStack]: Prepared Scene to Connection.");
-                                m_log.Debug("[MXP ClientStack]: Accepting connection...");
-                                AcceptConnection(session, joinRequestMessage, mxpSessionID, userId);
-                                m_log.Info("[MXP ClientStack]: Accepted connection.");
-
-                                m_log.Debug("[MXP ClientStack]: Creating ClientView....");
-                                MXPClientView client = new MXPClientView(session, mxpSessionID, userId, scene, account.FirstName, account.LastName);
-                                m_clients.Add(client);
-                                m_log.Debug("[MXP ClientStack]: Created ClientView.");
-
-                                client.MXPSendSynchronizationBegin(m_scenes[new UUID(joinRequestMessage.BubbleId)].SceneContents.GetTotalObjectsCount());
-
-                                m_log.Debug("[MXP ClientStack]: Starting ClientView...");
-                                try
-                                {
-                                    client.Start();
-                                    m_log.Debug("[MXP ClientStack]: Started ClientView.");
-                                }
-                                catch (Exception e)
-                                {
-                                    m_log.Error(e);
-                                }
-
-                                m_log.Debug("[MXP ClientStack]: Connected");
-                            }
-                            else
-                            {
-                                m_log.Info("[MXP ClientStack]: Session join request failure: " + session.SessionId + " (" +
-                                           (session.IsIncoming ? "from" : "to") + " " + session.RemoteEndPoint.Address + ":" +
-                                           session.RemoteEndPoint.Port + ")");
-
-                                DeclineConnection(session, joinRequestMessage);
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.Error("[MXP ClientStack]: Session join request failure: " + session.SessionId + " (" +
-                               (session.IsIncoming ? "from" : "to") + " " + session.RemoteEndPoint.Address + ":" +
-                               session.RemoteEndPoint.Port + "): "+e.ToString()+" :"+e.StackTrace.ToString());
-                        }
-                        tmpRemove.Add(session);
-                    }
-                }
-            }
-
-            foreach (Session session in tmpRemove)
-            {
-                m_sessionsToClient.Remove(session);
-            }
-
-            foreach (MXPClientView clientView in m_clients)
-            {
-                int messagesProcessedCount = 0;
-                Session session = clientView.Session;
-
-                while (session.AvailableMessages > 0)
-                {
-                    Message message = session.Receive();
-
-                    if (message.GetType() == typeof(LeaveRequestMessage))
-                    {
-                        LeaveResponseMessage leaveResponseMessage = (LeaveResponseMessage)MessageFactory.Current.ReserveMessage(
-                            typeof(LeaveResponseMessage));
-
-                        m_log.Debug("[MXP ClientStack]: Session leave request: " + session.SessionId + " (" + (session.IsIncoming ? "from" : "to") + " " + session.RemoteEndPoint.Address + ":" + session.RemoteEndPoint.Port + ")");
-
-                        leaveResponseMessage.RequestMessageId = message.MessageId;
-                        leaveResponseMessage.FailureCode = 0;
-                        session.Send(leaveResponseMessage);
-
-                        if (session.SessionState != SessionState.Disconnected)
-                        {
-                            session.SetStateDisconnected();
-                        }
-
-                        m_log.Debug("[MXP ClientStack]: Removing Client from Scene");
-                        //clientView.Scene.RemoveClient(clientView.AgentId);
-                    }
-                    if (message.GetType() == typeof(LeaveResponseMessage))
-                    {
-                        LeaveResponseMessage leaveResponseMessage = (LeaveResponseMessage)message;
-
-                        m_log.Debug("[MXP ClientStack]: Session leave response: " + session.SessionId + " (" + (session.IsIncoming ? "from" : "to") + " " + session.RemoteEndPoint.Address + ":" + session.RemoteEndPoint.Port + ")");
-
-                        if (leaveResponseMessage.FailureCode == 0)
-                        {
-                            session.SetStateDisconnected();
-                        }
-
-                        m_log.Debug("[MXP ClientStack]: Removing Client from Scene");
-                        //clientView.Scene.RemoveClient(clientView.AgentId);
-                    }
-                    else
-                    {
-                        clientView.MXPPRocessMessage(message);
-                    }
-
-                    MessageFactory.Current.ReleaseMessage(message);
-                    messagesProcessedCount++;
-                    if (messagesProcessedCount > 1000)
-                    {
-                        break;
-                    }
-                }
-            }
-        }
-
-        private void AcceptConnection(Session session, JoinRequestMessage joinRequestMessage, UUID mxpSessionID, UUID userId)
-        {
-            JoinResponseMessage joinResponseMessage = (JoinResponseMessage)MessageFactory.Current.ReserveMessage(
-                                                                               typeof(JoinResponseMessage));
-
-            joinResponseMessage.RequestMessageId = joinRequestMessage.MessageId;
-            joinResponseMessage.FailureCode = MxpResponseCodes.SUCCESS;
-            
-            joinResponseMessage.BubbleId = joinRequestMessage.BubbleId;
-            joinResponseMessage.ParticipantId = userId.Guid;
-            joinResponseMessage.AvatarId = userId.Guid;
-            joinResponseMessage.BubbleAssetCacheUrl = "http://" +
-                                                      NetworkUtil.GetHostFor(session.RemoteEndPoint.Address,
-                                                                             m_scenes[
-                                                                                 new UUID(joinRequestMessage.BubbleId)].
-                                                                                 RegionInfo.
-                                                                                 ExternalHostName) + ":" +
-                                                      m_scenes[new UUID(joinRequestMessage.BubbleId)].RegionInfo.
-                                                          HttpPort + "/assets/";
-
-            joinResponseMessage.BubbleName = m_scenes[new UUID(joinRequestMessage.BubbleId)].RegionInfo.RegionName;
-
-            joinResponseMessage.BubbleRange = 128;
-            joinResponseMessage.BubblePerceptionRange = 128 + 256;
-            joinResponseMessage.BubbleRealTime = 0;
-            joinResponseMessage.ProgramName = m_programName;
-            joinResponseMessage.ProgramMajorVersion = m_programMajorVersion;
-            joinResponseMessage.ProgramMinorVersion = m_programMinorVersion;
-            joinResponseMessage.ProtocolMajorVersion = MxpConstants.ProtocolMajorVersion;
-            joinResponseMessage.ProtocolMinorVersion = MxpConstants.ProtocolMinorVersion;
-            joinResponseMessage.ProtocolSourceRevision = MxpConstants.ProtocolSourceRevision;
-
-            session.Send(joinResponseMessage);
-
-            session.SetStateConnected();
-        }
-
-        private void DeclineConnection(Session session, Message joinRequestMessage)
-        {
-            JoinResponseMessage joinResponseMessage = (JoinResponseMessage)MessageFactory.Current.ReserveMessage(typeof(JoinResponseMessage));
-
-            joinResponseMessage.RequestMessageId = joinRequestMessage.MessageId;
-            joinResponseMessage.FailureCode = MxpResponseCodes.UNAUTHORIZED_OPERATION;
-
-            joinResponseMessage.ProgramName = m_programName;
-            joinResponseMessage.ProgramMajorVersion = m_programMajorVersion;
-            joinResponseMessage.ProgramMinorVersion = m_programMinorVersion;
-            joinResponseMessage.ProtocolMajorVersion = MxpConstants.ProtocolMajorVersion;
-            joinResponseMessage.ProtocolMinorVersion = MxpConstants.ProtocolMinorVersion;
-            joinResponseMessage.ProtocolSourceRevision = MxpConstants.ProtocolSourceRevision;
-
-            session.Send(joinResponseMessage);
-
-            session.SetStateDisconnected();
-        }
-
-        public bool AuthoriseUser(string participantName, string password, UUID sceneId, out UserAccount account)
-        {
-            UUID userId = UUID.Zero;
-            string firstName = "";
-            string lastName = "";
-            account = null;
-
-            string[] nameParts = participantName.Split(' ');
-            if (nameParts.Length != 2)
-            {
-                m_log.Error("[MXP ClientStack]: Login failed as user name is not formed of first and last name separated by space: " + participantName);
-                return false;
-            }
-            firstName = nameParts[0];
-            lastName = nameParts[1];
-
-            account = m_scenes[sceneId].UserAccountService.GetUserAccount(m_scenes[sceneId].RegionInfo.ScopeID, firstName, lastName);
-            if (account != null)
-                return (m_scenes[sceneId].AuthenticationService.Authenticate(account.PrincipalID, password, 1) != string.Empty);
-
-            return false;
-        }
-
-        private void AttachUserAgentToUserProfile(UserAccount account, Session session, UUID sessionId, UUID sceneId, out UUID secureSessionId)
-        {
-            secureSessionId = UUID.Random();
-            Scene scene = m_scenes[sceneId];
-            scene.PresenceService.LoginAgent(account.PrincipalID.ToString(), sessionId, secureSessionId);
-        }
-
-        private bool PrepareSceneForConnection(UUID sessionId, UUID secureSessionId, UUID sceneId, UserAccount account, out string reason)
-        {
-            Scene scene = m_scenes[sceneId];
-
-            AgentCircuitData agent = new AgentCircuitData();
-            agent.AgentID = account.PrincipalID;
-            agent.firstname = account.FirstName;
-            agent.lastname = account.LastName;
-            agent.SessionID = sessionId;
-            agent.SecureSessionID = secureSessionId;
-            agent.circuitcode = sessionId.CRC();
-            agent.BaseFolder = UUID.Zero;
-            agent.InventoryFolder = UUID.Zero;
-            agent.startpos = new Vector3(0, 0, 0); // TODO Fill in region start position
-            agent.CapsPath = "http://localhost/";
-            AvatarData avatar = scene.AvatarService.GetAvatar(account.PrincipalID);
-            if (avatar != null)
-                agent.Appearance = avatar.ToAvatarAppearance(account.PrincipalID);  //userService.GetUserAppearance(userProfile.ID);
-
-            if (agent.Appearance == null)
-            {
-                m_log.WarnFormat("[INTER]: Appearance not found for {0} {1}. Creating default.", agent.firstname, agent.lastname);
-                agent.Appearance = new AvatarAppearance();
-            }
-            
-            return scene.NewUserConnection(agent, 0, out reason);
-        }
-
-        public void PrintDebugInformation()
-        {
-            m_log.Info("[MXP ClientStack]: Statistics report");
-            m_log.Info("Pending Sessions: " + PendingSessionCount);
-            m_log.Info("Sessions: " + SessionCount + " (Clients: " + m_clients.Count + " )");
-            m_log.Info("Transmitter Alive?: " + IsTransmitterAlive);
-            m_log.Info("Packets Sent/Received: " + PacketsSent + " / " + PacketsReceived);
-            m_log.Info("Bytes Sent/Received: " + BytesSent + " / " + BytesReceived);
-            m_log.Info("Send/Receive Rate (bps): " + SendRate + " / " + ReceiveRate);
-        }
-
-        #endregion
-    
-    }
-}
--- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
+++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
--- a/OpenSim/Client/Sirikata/Protocol/MessageHeader.cs
+++ b/OpenSim/Client/Sirikata/Protocol/MessageHeader.cs
@@ -1,630 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-using pb = global::Google.ProtocolBuffers;
-using pbc = global::Google.ProtocolBuffers.Collections;
-using pbd = global::Google.ProtocolBuffers.Descriptors;
-using scg = global::System.Collections.Generic;
-namespace Sirikata.Protocol._PBJ_Internal {
-  
-  public static partial class MessageHeader {
-  
-    #region Extension registration
-    public static void RegisterAllExtensions(pb::ExtensionRegistry registry) {
-    }
-    #endregion
-    #region Static variables
-    internal static pbd::MessageDescriptor internal__static_Sirikata_Protocol__PBJ_Internal_Header__Descriptor;
-    internal static pb::FieldAccess.FieldAccessorTable<global::Sirikata.Protocol._PBJ_Internal.Header, global::Sirikata.Protocol._PBJ_Internal.Header.Builder> internal__static_Sirikata_Protocol__PBJ_Internal_Header__FieldAccessorTable;
-    #endregion
-    #region Descriptor
-    public static pbd::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbd::FileDescriptor descriptor;
-    
-    static MessageHeader() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          "ChNNZXNzYWdlSGVhZGVyLnByb3RvEh9TaXJpa2F0YS5Qcm90b2NvbC5fUEJK" + 
-          "X0ludGVybmFsIooDCgZIZWFkZXISFQoNc291cmNlX29iamVjdBgBIAEoDBIT" + 
-          "Cgtzb3VyY2VfcG9ydBgDIAEoDRIVCgxzb3VyY2Vfc3BhY2UYgAwgASgMEhoK" + 
-          "EmRlc3RpbmF0aW9uX29iamVjdBgCIAEoDBIYChBkZXN0aW5hdGlvbl9wb3J0" + 
-          "GAQgASgNEhoKEWRlc3RpbmF0aW9uX3NwYWNlGIEMIAEoDBIKCgJpZBgHIAEo" + 
-          "AxIQCghyZXBseV9pZBgIIAEoAxJMCg1yZXR1cm5fc3RhdHVzGIAOIAEoDjI0" + 
-          "LlNpcmlrYXRhLlByb3RvY29sLl9QQkpfSW50ZXJuYWwuSGVhZGVyLlJldHVy" + 
-          "blN0YXR1cyJ/CgxSZXR1cm5TdGF0dXMSCwoHU1VDQ0VTUxAAEhMKD05FVFdP" + 
-          "UktfRkFJTFVSRRABEhMKD1RJTUVPVVRfRkFJTFVSRRADEhIKDlBST1RPQ09M" + 
-          "X0VSUk9SEAQSEAoMUE9SVF9GQUlMVVJFEAUSEgoOVU5LTk9XTl9PQkpFQ1QQ" + 
-          "Bg==");
-      pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) {
-        descriptor = root;
-        internal__static_Sirikata_Protocol__PBJ_Internal_Header__Descriptor = Descriptor.MessageTypes[0];
-        internal__static_Sirikata_Protocol__PBJ_Internal_Header__FieldAccessorTable = 
-            new pb::FieldAccess.FieldAccessorTable<global::Sirikata.Protocol._PBJ_Internal.Header, global::Sirikata.Protocol._PBJ_Internal.Header.Builder>(internal__static_Sirikata_Protocol__PBJ_Internal_Header__Descriptor,
-                new string[] { "SourceObject", "SourcePort", "SourceSpace", "DestinationObject", "DestinationPort", "DestinationSpace", "Id", "ReplyId", "ReturnStatus", });
-        return null;
-      };
-      pbd::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
-          new pbd::FileDescriptor[] {
-          }, assigner);
-    }
-    #endregion
-    
-  }
-  #region Messages
-  public sealed partial class Header : pb::GeneratedMessage<Header, Header.Builder> {
-    private static readonly Header defaultInstance = new Builder().BuildPartial();
-    public static Header DefaultInstance {
-      get { return defaultInstance; }
-    }
-    
-    public override Header DefaultInstanceForType {
-      get { return defaultInstance; }
-    }
-    
-    protected override Header ThisMessage {
-      get { return this; }
-    }
-    
-    public static pbd::MessageDescriptor Descriptor {
-      get { return global::Sirikata.Protocol._PBJ_Internal.MessageHeader.internal__static_Sirikata_Protocol__PBJ_Internal_Header__Descriptor; }
-    }
-    
-    protected override pb::FieldAccess.FieldAccessorTable<Header, Header.Builder> InternalFieldAccessors {
-      get { return global::Sirikata.Protocol._PBJ_Internal.MessageHeader.internal__static_Sirikata_Protocol__PBJ_Internal_Header__FieldAccessorTable; }
-    }
-    
-    #region Nested types
-    public static class Types {
-      public enum ReturnStatus {
-        SUCCESS = 0,
-        NETWORK_FAILURE = 1,
-        TIMEOUT_FAILURE = 3,
-        PROTOCOL_ERROR = 4,
-        PORT_FAILURE = 5,
-        UNKNOWN_OBJECT = 6,
-      }
-      
-    }
-    #endregion
-    
-    public const int SourceObjectFieldNumber = 1;
-    private bool hasSourceObject;
-    private pb::ByteString sourceObject_ = pb::ByteString.Empty;
-    public bool HasSourceObject {
-      get { return hasSourceObject; }
-    }
-    public pb::ByteString SourceObject {
-      get { return sourceObject_; }
-    }
-    
-    public const int SourcePortFieldNumber = 3;
-    private bool hasSourcePort;
-    private uint sourcePort_ = 0;
-    public bool HasSourcePort {
-      get { return hasSourcePort; }
-    }
-    [global::System.CLSCompliant(false)]
-    public uint SourcePort {
-      get { return sourcePort_; }
-    }
-    
-    public const int SourceSpaceFieldNumber = 1536;
-    private bool hasSourceSpace;
-    private pb::ByteString sourceSpace_ = pb::ByteString.Empty;
-    public bool HasSourceSpace {
-      get { return hasSourceSpace; }
-    }
-    public pb::ByteString SourceSpace {
-      get { return sourceSpace_; }
-    }
-    
-    public const int DestinationObjectFieldNumber = 2;
-    private bool hasDestinationObject;
-    private pb::ByteString destinationObject_ = pb::ByteString.Empty;
-    public bool HasDestinationObject {
-      get { return hasDestinationObject; }
-    }
-    public pb::ByteString DestinationObject {
-      get { return destinationObject_; }
-    }
-    
-    public const int DestinationPortFieldNumber = 4;
-    private bool hasDestinationPort;
-    private uint destinationPort_ = 0;
-    public bool HasDestinationPort {
-      get { return hasDestinationPort; }
-    }
-    [global::System.CLSCompliant(false)]
-    public uint DestinationPort {
-      get { return destinationPort_; }
-    }
-    
-    public const int DestinationSpaceFieldNumber = 1537;
-    private bool hasDestinationSpace;
-    private pb::ByteString destinationSpace_ = pb::ByteString.Empty;
-    public bool HasDestinationSpace {
-      get { return hasDestinationSpace; }
-    }
-    public pb::ByteString DestinationSpace {
-      get { return destinationSpace_; }
-    }
-    
-    public const int IdFieldNumber = 7;
-    private bool hasId;
-    private long id_ = 0L;
-    public bool HasId {
-      get { return hasId; }
-    }
-    public long Id {
-      get { return id_; }
-    }
-    
-    public const int ReplyIdFieldNumber = 8;
-    private bool hasReplyId;
-    private long replyId_ = 0L;
-    public bool HasReplyId {
-      get { return hasReplyId; }
-    }
-    public long ReplyId {
-      get { return replyId_; }
-    }
-    
-    public const int ReturnStatusFieldNumber = 1792;
-    private bool hasReturnStatus;
-    private global::Sirikata.Protocol._PBJ_Internal.Header.Types.ReturnStatus returnStatus_ = global::Sirikata.Protocol._PBJ_Internal.Header.Types.ReturnStatus.SUCCESS;
-    public bool HasReturnStatus {
-      get { return hasReturnStatus; }
-    }
-    public global::Sirikata.Protocol._PBJ_Internal.Header.Types.ReturnStatus ReturnStatus {
-      get { return returnStatus_; }
-    }
-    
-    public override bool IsInitialized {
-      get {
-        return true;
-      }
-    }
-    
-    public override void WriteTo(pb::CodedOutputStream output) {
-      if (HasSourceObject) {
-        output.WriteBytes(1, SourceObject);
-      }
-      if (HasDestinationObject) {
-        output.WriteBytes(2, DestinationObject);
-      }
-      if (HasSourcePort) {
-        output.WriteUInt32(3, SourcePort);
-      }
-      if (HasDestinationPort) {
-        output.WriteUInt32(4, DestinationPort);
-      }
-      if (HasId) {
-        output.WriteInt64(7, Id);
-      }
-      if (HasReplyId) {
-        output.WriteInt64(8, ReplyId);
-      }
-      if (HasSourceSpace) {
-        output.WriteBytes(1536, SourceSpace);
-      }
-      if (HasDestinationSpace) {
-        output.WriteBytes(1537, DestinationSpace);
-      }
-      if (HasReturnStatus) {
-        output.WriteEnum(1792, (int) ReturnStatus);
-      }
-      UnknownFields.WriteTo(output);
-    }
-    
-    private int memoizedSerializedSize = -1;
-    public override int SerializedSize {
-      get {
-        int size = memoizedSerializedSize;
-        if (size != -1) return size;
-        
-        size = 0;
-        if (HasSourceObject) {
-          size += pb::CodedOutputStream.ComputeBytesSize(1, SourceObject);
-        }
-        if (HasSourcePort) {
-          size += pb::CodedOutputStream.ComputeUInt32Size(3, SourcePort);
-        }
-        if (HasSourceSpace) {
-          size += pb::CodedOutputStream.ComputeBytesSize(1536, SourceSpace);
-        }
-        if (HasDestinationObject) {
-          size += pb::CodedOutputStream.ComputeBytesSize(2, DestinationObject);
-        }
-        if (HasDestinationPort) {
-          size += pb::CodedOutputStream.ComputeUInt32Size(4, DestinationPort);
-        }
-        if (HasDestinationSpace) {
-          size += pb::CodedOutputStream.ComputeBytesSize(1537, DestinationSpace);
-        }
-        if (HasId) {
-          size += pb::CodedOutputStream.ComputeInt64Size(7, Id);
-        }
-        if (HasReplyId) {
-          size += pb::CodedOutputStream.ComputeInt64Size(8, ReplyId);
-        }
-        if (HasReturnStatus) {
-          size += pb::CodedOutputStream.ComputeEnumSize(1792, (int) ReturnStatus);
-        }
-        size += UnknownFields.SerializedSize;
-        memoizedSerializedSize = size;
-        return size;
-      }
-    }
-    
-    public static Header ParseFrom(pb::ByteString data) {
-      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static Header ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static Header ParseFrom(byte[] data) {
-      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static Header ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static Header ParseFrom(global::System.IO.Stream input) {
-      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static Header ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    public static Header ParseDelimitedFrom(global::System.IO.Stream input) {
-      return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
-    }
-    public static Header ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
-      return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
-    }
-    public static Header ParseFrom(pb::CodedInputStream input) {
-      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static Header ParseFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    public static Builder CreateBuilder() { return new Builder(); }
-    public override Builder ToBuilder() { return CreateBuilder(this); }
-    public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(Header prototype) {
-      return (Builder) new Builder().MergeFrom(prototype);
-    }
-    
-    public sealed partial class Builder : pb::GeneratedBuilder<Header, Builder> {
-      protected override Builder ThisBuilder {
-        get { return this; }
-      }
-      public Builder() {}
-      
-      Header result = new Header();
-      
-      protected override Header MessageBeingBuilt {
-        get { return result; }
-      }
-      
-      public override Builder Clear() {
-        result = new Header();
-        return this;
-      }
-      
-      public override Builder Clone() {
-        return new Builder().MergeFrom(result);
-      }
-      
-      public override pbd::MessageDescriptor DescriptorForType {
-        get { return global::Sirikata.Protocol._PBJ_Internal.Header.Descriptor; }
-      }
-      
-      public override Header DefaultInstanceForType {
-        get { return global::Sirikata.Protocol._PBJ_Internal.Header.DefaultInstance; }
-      }
-      
-      public override Header BuildPartial() {
-        if (result == null) {
-          throw new global::System.InvalidOperationException("build() has already been called on this Builder");
-        }
-        Header returnMe = result;
-        result = null;
-        return returnMe;
-      }
-      
-      public override Builder MergeFrom(pb::IMessage other) {
-        if (other is Header) {
-          return MergeFrom((Header) other);
-        } else {
-          base.MergeFrom(other);
-          return this;
-        }
-      }
-      
-      public override Builder MergeFrom(Header other) {
-        if (other == global::Sirikata.Protocol._PBJ_Internal.Header.DefaultInstance) return this;
-        if (other.HasSourceObject) {
-          SourceObject = other.SourceObject;
-        }
-        if (other.HasSourcePort) {
-          SourcePort = other.SourcePort;
-        }
-        if (other.HasSourceSpace) {
-          SourceSpace = other.SourceSpace;
-        }
-        if (other.HasDestinationObject) {
-          DestinationObject = other.DestinationObject;
-        }
-        if (other.HasDestinationPort) {
-          DestinationPort = other.DestinationPort;
-        }
-        if (other.HasDestinationSpace) {
-          DestinationSpace = other.DestinationSpace;
-        }
-        if (other.HasId) {
-          Id = other.Id;
-        }
-        if (other.HasReplyId) {
-          ReplyId = other.ReplyId;
-        }
-        if (other.HasReturnStatus) {
-          ReturnStatus = other.ReturnStatus;
-        }
-        this.MergeUnknownFields(other.UnknownFields);
-        return this;
-      }
-      
-      public override Builder MergeFrom(pb::CodedInputStream input) {
-        return MergeFrom(input, pb::ExtensionRegistry.Empty);
-      }
-      
-      public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
-        pb::UnknownFieldSet.Builder unknownFields = null;
-        while (true) {
-          uint tag = input.ReadTag();
-          switch (tag) {
-            case 0: {
-              if (unknownFields != null) {
-                this.UnknownFields = unknownFields.Build();
-              }
-              return this;
-            }
-            default: {
-              if (pb::WireFormat.IsEndGroupTag(tag)) {
-                if (unknownFields != null) {
-                  this.UnknownFields = unknownFields.Build();
-                }
-                return this;
-              }
-              if (unknownFields == null) {
-                unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-              }
-              ParseUnknownField(input, unknownFields, extensionRegistry, tag);
-              break;
-            }
-            case 10: {
-              SourceObject = input.ReadBytes();
-              break;
-            }
-            case 18: {
-              DestinationObject = input.ReadBytes();
-              break;
-            }
-            case 24: {
-              SourcePort = input.ReadUInt32();
-              break;
-            }
-            case 32: {
-              DestinationPort = input.ReadUInt32();
-              break;
-            }
-            case 56: {
-              Id = input.ReadInt64();
-              break;
-            }
-            case 64: {
-              ReplyId = input.ReadInt64();
-              break;
-            }
-            case 12290: {
-              SourceSpace = input.ReadBytes();
-              break;
-            }
-            case 12298: {
-              DestinationSpace = input.ReadBytes();
-              break;
-            }
-            case 14336: {
-              int rawValue = input.ReadEnum();
-              if (!global::System.Enum.IsDefined(typeof(global::Sirikata.Protocol._PBJ_Internal.Header.Types.ReturnStatus), rawValue)) {
-                if (unknownFields == null) {
-                  unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-                }
-                unknownFields.MergeVarintField(1792, (ulong) rawValue);
-              } else {
-                ReturnStatus = (global::Sirikata.Protocol._PBJ_Internal.Header.Types.ReturnStatus) rawValue;
-              }
-              break;
-            }
-          }
-        }
-      }
-      
-      
-      public bool HasSourceObject {
-        get { return result.HasSourceObject; }
-      }
-      public pb::ByteString SourceObject {
-        get { return result.SourceObject; }
-        set { SetSourceObject(value); }
-      }
-      public Builder SetSourceObject(pb::ByteString value) {
-        pb::ThrowHelper.ThrowIfNull(value, "value");
-        result.hasSourceObject = true;
-        result.sourceObject_ = value;
-        return this;
-      }
-      public Builder ClearSourceObject() {
-        result.hasSourceObject = false;
-        result.sourceObject_ = pb::ByteString.Empty;
-        return this;
-      }
-      
-      public bool HasSourcePort {
-        get { return result.HasSourcePort; }
-      }
-      [global::System.CLSCompliant(false)]
-      public uint SourcePort {
-        get { return result.SourcePort; }
-        set { SetSourcePort(value); }
-      }
-      [global::System.CLSCompliant(false)]
-      public Builder SetSourcePort(uint value) {
-        result.hasSourcePort = true;
-        result.sourcePort_ = value;
-        return this;
-      }
-      public Builder ClearSourcePort() {
-        result.hasSourcePort = false;
-        result.sourcePort_ = 0;
-        return this;
-      }
-      
-      public bool HasSourceSpace {
-        get { return result.HasSourceSpace; }
-      }
-      public pb::ByteString SourceSpace {
-        get { return result.SourceSpace; }
-        set { SetSourceSpace(value); }
-      }
-      public Builder SetSourceSpace(pb::ByteString value) {
-        pb::ThrowHelper.ThrowIfNull(value, "value");
-        result.hasSourceSpace = true;
-        result.sourceSpace_ = value;
-        return this;
-      }
-      public Builder ClearSourceSpace() {
-        result.hasSourceSpace = false;
-        result.sourceSpace_ = pb::ByteString.Empty;
-        return this;
-      }
-      
-      public bool HasDestinationObject {
-        get { return result.HasDestinationObject; }
-      }
-      public pb::ByteString DestinationObject {
-        get { return result.DestinationObject; }
-        set { SetDestinationObject(value); }
-      }
-      public Builder SetDestinationObject(pb::ByteString value) {
-        pb::ThrowHelper.ThrowIfNull(value, "value");
-        result.hasDestinationObject = true;
-        result.destinationObject_ = value;
-        return this;
-      }
-      public Builder ClearDestinationObject() {
-        result.hasDestinationObject = false;
-        result.destinationObject_ = pb::ByteString.Empty;
-        return this;
-      }
-      
-      public bool HasDestinationPort {
-        get { return result.HasDestinationPort; }
-      }
-      [global::System.CLSCompliant(false)]
-      public uint DestinationPort {
-        get { return result.DestinationPort; }
-        set { SetDestinationPort(value); }
-      }
-      [global::System.CLSCompliant(false)]
-      public Builder SetDestinationPort(uint value) {
-        result.hasDestinationPort = true;
-        result.destinationPort_ = value;
-        return this;
-      }
-      public Builder ClearDestinationPort() {
-        result.hasDestinationPort = false;
-        result.destinationPort_ = 0;
-        return this;
-      }
-      
-      public bool HasDestinationSpace {
-        get { return result.HasDestinationSpace; }
-      }
-      public pb::ByteString DestinationSpace {
-        get { return result.DestinationSpace; }
-        set { SetDestinationSpace(value); }
-      }
-      public Builder SetDestinationSpace(pb::ByteString value) {
-        pb::ThrowHelper.ThrowIfNull(value, "value");
-        result.hasDestinationSpace = true;
-        result.destinationSpace_ = value;
-        return this;
-      }
-      public Builder ClearDestinationSpace() {
-        result.hasDestinationSpace = false;
-        result.destinationSpace_ = pb::ByteString.Empty;
-        return this;
-      }
-      
-      public bool HasId {
-        get { return result.HasId; }
-      }
-      public long Id {
-        get { return result.Id; }
-        set { SetId(value); }
-      }
-      public Builder SetId(long value) {
-        result.hasId = true;
-        result.id_ = value;
-        return this;
-      }
-      public Builder ClearId() {
-        result.hasId = false;
-        result.id_ = 0L;
-        return this;
-      }
-      
-      public bool HasReplyId {
-        get { return result.HasReplyId; }
-      }
-      public long ReplyId {
-        get { return result.ReplyId; }
-        set { SetReplyId(value); }
-      }
-      public Builder SetReplyId(long value) {
-        result.hasReplyId = true;
-        result.replyId_ = value;
-        return this;
-      }
-      public Builder ClearReplyId() {
-        result.hasReplyId = false;
-        result.replyId_ = 0L;
-        return this;
-      }
-      
-      public bool HasReturnStatus {
-       get { return result.HasReturnStatus; }
-      }
-      public global::Sirikata.Protocol._PBJ_Internal.Header.Types.ReturnStatus ReturnStatus {
-        get { return result.ReturnStatus; }
-        set { SetReturnStatus(value); }
-      }
-      public Builder SetReturnStatus(global::Sirikata.Protocol._PBJ_Internal.Header.Types.ReturnStatus value) {
-        result.hasReturnStatus = true;
-        result.returnStatus_ = value;
-        return this;
-      }
-      public Builder ClearReturnStatus() {
-        result.hasReturnStatus = false;
-        result.returnStatus_ = global::Sirikata.Protocol._PBJ_Internal.Header.Types.ReturnStatus.SUCCESS;
-        return this;
-      }
-    }
-    static Header() {
-      object.ReferenceEquals(global::Sirikata.Protocol._PBJ_Internal.MessageHeader.Descriptor, null);
-    }
-  }
-  
-  #endregion
-  
-}
--- a/OpenSim/Client/Sirikata/Protocol/MessageHeader.pbj.cs
+++ b/OpenSim/Client/Sirikata/Protocol/MessageHeader.pbj.cs
@@ -1,339 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using pbd = global::Google.ProtocolBuffers.Descriptors;
-using pb = global::Google.ProtocolBuffers;
-namespace Sirikata.Protocol {
-    public class Header : PBJ.IMessage {
-        protected _PBJ_Internal.Header super;
-        public _PBJ_Internal.Header _PBJSuper{ get { return super;} }
-        public Header() {
-            super=new _PBJ_Internal.Header();
-        }
-        public Header(_PBJ_Internal.Header reference) {
-            super=reference;
-        }
-        public static Header defaultInstance= new Header (_PBJ_Internal.Header.DefaultInstance);
-        public static Header DefaultInstance{
-            get {return defaultInstance;}
-        }
-        public static pbd.MessageDescriptor Descriptor {
-            get { return _PBJ_Internal.Header.Descriptor; }        }
-        public static class Types {
-        public enum ReturnStatus {
-            SUCCESS=_PBJ_Internal.Header.Types.ReturnStatus.SUCCESS,
-            NETWORK_FAILURE=_PBJ_Internal.Header.Types.ReturnStatus.NETWORK_FAILURE,
-            TIMEOUT_FAILURE=_PBJ_Internal.Header.Types.ReturnStatus.TIMEOUT_FAILURE,
-            PROTOCOL_ERROR=_PBJ_Internal.Header.Types.ReturnStatus.PROTOCOL_ERROR,
-            PORT_FAILURE=_PBJ_Internal.Header.Types.ReturnStatus.PORT_FAILURE,
-            UNKNOWN_OBJECT=_PBJ_Internal.Header.Types.ReturnStatus.UNKNOWN_OBJECT
-        };
-        }
-        public static bool WithinReservedFieldTagRange(int field_tag) {
-            return false||(field_tag>=1&&field_tag<=8)||(field_tag>=1536&&field_tag<=2560)||(field_tag>=229376&&field_tag<=294912);
-        }
-        public static bool WithinExtensionFieldTagRange(int field_tag) {
-            return false;
-        }
-        public const int SourceObjectFieldTag=1;
-        public bool HasSourceObject{ get {return super.HasSourceObject&&PBJ._PBJ.ValidateUuid(super.SourceObject);} }
-        public PBJ.UUID SourceObject{ get {
-            if (HasSourceObject) {
-                return PBJ._PBJ.CastUuid(super.SourceObject);
-            } else {
-                return PBJ._PBJ.CastUuid();
-            }
-        }
-        }
-        public const int SourcePortFieldTag=3;
-        public bool HasSourcePort{ get {return super.HasSourcePort&&PBJ._PBJ.ValidateUint32(super.SourcePort);} }
-        public uint SourcePort{ get {
-            if (HasSourcePort) {
-                return PBJ._PBJ.CastUint32(super.SourcePort);
-            } else {
-                return PBJ._PBJ.CastUint32();
-            }
-        }
-        }
-        public const int SourceSpaceFieldTag=1536;
-        public bool HasSourceSpace{ get {return super.HasSourceSpace&&PBJ._PBJ.ValidateUuid(super.SourceSpace);} }
-        public PBJ.UUID SourceSpace{ get {
-            if (HasSourceSpace) {
-                return PBJ._PBJ.CastUuid(super.SourceSpace);
-            } else {
-                return PBJ._PBJ.CastUuid();
-            }
-        }
-        }
-        public const int DestinationObjectFieldTag=2;
-        public bool HasDestinationObject{ get {return super.HasDestinationObject&&PBJ._PBJ.ValidateUuid(super.DestinationObject);} }
-        public PBJ.UUID DestinationObject{ get {
-            if (HasDestinationObject) {
-                return PBJ._PBJ.CastUuid(super.DestinationObject);
-            } else {
-                return PBJ._PBJ.CastUuid();
-            }
-        }
-        }
-        public const int DestinationPortFieldTag=4;
-        public bool HasDestinationPort{ get {return super.HasDestinationPort&&PBJ._PBJ.ValidateUint32(super.DestinationPort);} }
-        public uint DestinationPort{ get {
-            if (HasDestinationPort) {
-                return PBJ._PBJ.CastUint32(super.DestinationPort);
-            } else {
-                return PBJ._PBJ.CastUint32();
-            }
-        }
-        }
-        public const int DestinationSpaceFieldTag=1537;
-        public bool HasDestinationSpace{ get {return super.HasDestinationSpace&&PBJ._PBJ.ValidateUuid(super.DestinationSpace);} }
-        public PBJ.UUID DestinationSpace{ get {
-            if (HasDestinationSpace) {
-                return PBJ._PBJ.CastUuid(super.DestinationSpace);
-            } else {
-                return PBJ._PBJ.CastUuid();
-            }
-        }
-        }
-        public const int IdFieldTag=7;
-        public bool HasId{ get {return super.HasId&&PBJ._PBJ.ValidateInt64(super.Id);} }
-        public long Id{ get {
-            if (HasId) {
-                return PBJ._PBJ.CastInt64(super.Id);
-            } else {
-                return PBJ._PBJ.CastInt64();
-            }
-        }
-        }
-        public const int ReplyIdFieldTag=8;
-        public bool HasReplyId{ get {return super.HasReplyId&&PBJ._PBJ.ValidateInt64(super.ReplyId);} }
-        public long ReplyId{ get {
-            if (HasReplyId) {
-                return PBJ._PBJ.CastInt64(super.ReplyId);
-            } else {
-                return PBJ._PBJ.CastInt64();
-            }
-        }
-        }
-        public const int ReturnStatusFieldTag=1792;
-        public bool HasReturnStatus{ get {return super.HasReturnStatus;} }
-        public Types.ReturnStatus ReturnStatus{ get {
-            if (HasReturnStatus) {
-                return (Types.ReturnStatus)super.ReturnStatus;
-            } else {
-                return new Types.ReturnStatus();
-            }
-        }
-        }
-            public override Google.ProtocolBuffers.IMessage _PBJISuper { get { return super; } }
-        public override PBJ.IMessage.IBuilder WeakCreateBuilderForType() { return new Builder(); }
-        public static Builder CreateBuilder() { return new Builder(); }
-        public static Builder CreateBuilder(Header prototype) {
-            return (Builder)new Builder().MergeFrom(prototype);
-        }
-        public static Header ParseFrom(pb::ByteString data) {
-            return new Header(_PBJ_Internal.Header.ParseFrom(data));
-        }
-        public static Header ParseFrom(pb::ByteString data, pb::ExtensionRegistry er) {
-            return new Header(_PBJ_Internal.Header.ParseFrom(data,er));
-        }
-        public static Header ParseFrom(byte[] data) {
-            return new Header(_PBJ_Internal.Header.ParseFrom(data));
-        }
-        public static Header ParseFrom(byte[] data, pb::ExtensionRegistry er) {
-            return new Header(_PBJ_Internal.Header.ParseFrom(data,er));
-        }
-        public static Header ParseFrom(global::System.IO.Stream data) {
-            return new Header(_PBJ_Internal.Header.ParseFrom(data));
-        }
-        public static Header ParseFrom(global::System.IO.Stream data, pb::ExtensionRegistry er) {
-            return new Header(_PBJ_Internal.Header.ParseFrom(data,er));
-        }
-        public static Header ParseFrom(pb::CodedInputStream data) {
-            return new Header(_PBJ_Internal.Header.ParseFrom(data));
-        }
-        public static Header ParseFrom(pb::CodedInputStream data, pb::ExtensionRegistry er) {
-            return new Header(_PBJ_Internal.Header.ParseFrom(data,er));
-        }
-        protected override bool _HasAllPBJFields{ get {
-            return true
-                ;
-        } }
-        public bool IsInitialized { get {
-            return super.IsInitialized&&_HasAllPBJFields;
-        } }
-        public class Builder : global::PBJ.IMessage.IBuilder{
-        protected override bool _HasAllPBJFields{ get {
-            return true
-                ;
-        } }
-        public bool IsInitialized { get {
-            return super.IsInitialized&&_HasAllPBJFields;
-        } }
-            protected _PBJ_Internal.Header.Builder super;
-            public override Google.ProtocolBuffers.IBuilder _PBJISuper { get { return super; } }
-            public _PBJ_Internal.Header.Builder _PBJSuper{ get { return super;} }
-            public Builder() {super = new _PBJ_Internal.Header.Builder();}
-            public Builder(_PBJ_Internal.Header.Builder other) {
-                super=other;
-            }
-            public Builder Clone() {return new Builder(super.Clone());}
-            public Builder MergeFrom(Header prototype) { super.MergeFrom(prototype._PBJSuper);return this;}
-            public Builder Clear() {super.Clear();return this;}
-            public Header BuildPartial() {return new Header(super.BuildPartial());}
-            public Header Build() {if (_HasAllPBJFields) return new Header(super.Build());return null;}
-            public pbd::MessageDescriptor DescriptorForType {
-                get { return Header.Descriptor; }            }
-        public Builder ClearSourceObject() { super.ClearSourceObject();return this;}
-        public const int SourceObjectFieldTag=1;
-        public bool HasSourceObject{ get {return super.HasSourceObject&&PBJ._PBJ.ValidateUuid(super.SourceObject);} }
-        public PBJ.UUID SourceObject{ get {
-            if (HasSourceObject) {
-                return PBJ._PBJ.CastUuid(super.SourceObject);
-            } else {
-                return PBJ._PBJ.CastUuid();
-            }
-        }
-        set {
-            super.SourceObject=(PBJ._PBJ.Construct(value));
-        }
-        }
-        public Builder ClearSourcePort() { super.ClearSourcePort();return this;}
-        public const int SourcePortFieldTag=3;
-        public bool HasSourcePort{ get {return super.HasSourcePort&&PBJ._PBJ.ValidateUint32(super.SourcePort);} }
-        public uint SourcePort{ get {
-            if (HasSourcePort) {
-                return PBJ._PBJ.CastUint32(super.SourcePort);
-            } else {
-                return PBJ._PBJ.CastUint32();
-            }
-        }
-        set {
-            super.SourcePort=(PBJ._PBJ.Construct(value));
-        }
-        }
-        public Builder ClearSourceSpace() { super.ClearSourceSpace();return this;}
-        public const int SourceSpaceFieldTag=1536;
-        public bool HasSourceSpace{ get {return super.HasSourceSpace&&PBJ._PBJ.ValidateUuid(super.SourceSpace);} }
-        public PBJ.UUID SourceSpace{ get {
-            if (HasSourceSpace) {
-                return PBJ._PBJ.CastUuid(super.SourceSpace);
-            } else {
-                return PBJ._PBJ.CastUuid();
-            }
-        }
-        set {
-            super.SourceSpace=(PBJ._PBJ.Construct(value));
-        }
-        }
-        public Builder ClearDestinationObject() { super.ClearDestinationObject();return this;}
-        public const int DestinationObjectFieldTag=2;
-        public bool HasDestinationObject{ get {return super.HasDestinationObject&&PBJ._PBJ.ValidateUuid(super.DestinationObject);} }
-        public PBJ.UUID DestinationObject{ get {
-            if (HasDestinationObject) {
-                return PBJ._PBJ.CastUuid(super.DestinationObject);
-            } else {
-                return PBJ._PBJ.CastUuid();
-            }
-        }
-        set {
-            super.DestinationObject=(PBJ._PBJ.Construct(value));
-        }
-        }
-        public Builder ClearDestinationPort() { super.ClearDestinationPort();return this;}
-        public const int DestinationPortFieldTag=4;
-        public bool HasDestinationPort{ get {return super.HasDestinationPort&&PBJ._PBJ.ValidateUint32(super.DestinationPort);} }
-        public uint DestinationPort{ get {
-            if (HasDestinationPort) {
-                return PBJ._PBJ.CastUint32(super.DestinationPort);
-            } else {
-                return PBJ._PBJ.CastUint32();
-            }
-        }
-        set {
-            super.DestinationPort=(PBJ._PBJ.Construct(value));
-        }
-        }
-        public Builder ClearDestinationSpace() { super.ClearDestinationSpace();return this;}
-        public const int DestinationSpaceFieldTag=1537;
-        public bool HasDestinationSpace{ get {return super.HasDestinationSpace&&PBJ._PBJ.ValidateUuid(super.DestinationSpace);} }
-        public PBJ.UUID DestinationSpace{ get {
-            if (HasDestinationSpace) {
-                return PBJ._PBJ.CastUuid(super.DestinationSpace);
-            } else {
-                return PBJ._PBJ.CastUuid();
-            }
-        }
-        set {
-            super.DestinationSpace=(PBJ._PBJ.Construct(value));
-        }
-        }
-        public Builder ClearId() { super.ClearId();return this;}
-        public const int IdFieldTag=7;
-        public bool HasId{ get {return super.HasId&&PBJ._PBJ.ValidateInt64(super.Id);} }
-        public long Id{ get {
-            if (HasId) {
-                return PBJ._PBJ.CastInt64(super.Id);
-            } else {
-                return PBJ._PBJ.CastInt64();
-            }
-        }
-        set {
-            super.Id=(PBJ._PBJ.Construct(value));
-        }
-        }
-        public Builder ClearReplyId() { super.ClearReplyId();return this;}
-        public const int ReplyIdFieldTag=8;
-        public bool HasReplyId{ get {return super.HasReplyId&&PBJ._PBJ.ValidateInt64(super.ReplyId);} }
-        public long ReplyId{ get {
-            if (HasReplyId) {
-                return PBJ._PBJ.CastInt64(super.ReplyId);
-            } else {
-                return PBJ._PBJ.CastInt64();
-            }
-        }
-        set {
-            super.ReplyId=(PBJ._PBJ.Construct(value));
-        }
-        }
-        public Builder ClearReturnStatus() { super.ClearReturnStatus();return this;}
-        public const int ReturnStatusFieldTag=1792;
-        public bool HasReturnStatus{ get {return super.HasReturnStatus;} }
-        public Types.ReturnStatus ReturnStatus{ get {
-            if (HasReturnStatus) {
-                return (Types.ReturnStatus)super.ReturnStatus;
-            } else {
-                return new Types.ReturnStatus();
-            }
-        }
-        set {
-            super.ReturnStatus=((_PBJ_Internal.Header.Types.ReturnStatus)value);
-        }
-        }
-        }
-    }
-}
--- a/OpenSim/Client/Sirikata/Protocol/PBJ.cs
+++ b/OpenSim/Client/Sirikata/Protocol/PBJ.cs
--- a/OpenSim/Client/Sirikata/Protocol/Persistence.cs
+++ b/OpenSim/Client/Sirikata/Protocol/Persistence.cs
--- a/OpenSim/Client/Sirikata/Protocol/Persistence.pbj.cs
+++ b/OpenSim/Client/Sirikata/Protocol/Persistence.pbj.cs
--- a/OpenSim/Client/Sirikata/Protocol/Physics.cs
+++ b/OpenSim/Client/Sirikata/Protocol/Physics.cs
@@ -1,840 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-using pb = global::Google.ProtocolBuffers;
-using pbc = global::Google.ProtocolBuffers.Collections;
-using pbd = global::Google.ProtocolBuffers.Descriptors;
-using scg = global::System.Collections.Generic;
-namespace Sirikata.Physics.Protocol._PBJ_Internal {
-  
-  public static partial class Physics {
-  
-    #region Extension registration
-    public static void RegisterAllExtensions(pb::ExtensionRegistry registry) {
-    }
-    #endregion
-    #region Static variables
-    internal static pbd::MessageDescriptor internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionBegin__Descriptor;
-    internal static pb::FieldAccess.FieldAccessorTable<global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionBegin, global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionBegin.Builder> internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionBegin__FieldAccessorTable;
-    internal static pbd::MessageDescriptor internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionEnd__Descriptor;
-    internal static pb::FieldAccess.FieldAccessorTable<global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionEnd, global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionEnd.Builder> internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionEnd__FieldAccessorTable;
-    #endregion
-    #region Descriptor
-    public static pbd::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbd::FileDescriptor descriptor;
-    
-    static Physics() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          "Cg1QaHlzaWNzLnByb3RvEidTaXJpa2F0YS5QaHlzaWNzLlByb3RvY29sLl9Q" + 
-          "QkpfSW50ZXJuYWwiqAEKDkNvbGxpc2lvbkJlZ2luEhEKCXRpbWVzdGFtcBgC" + 
-          "IAEoBhIZCg10aGlzX3Bvc2l0aW9uGAMgAygBQgIQARIaCg5vdGhlcl9wb3Np" + 
-          "dGlvbhgEIAMoAUICEAESFwoLdGhpc19ub3JtYWwYBSADKAJCAhABEhMKB2lt" + 
-          "cHVsc2UYBiADKAJCAhABEh4KFm90aGVyX29iamVjdF9yZWZlcmVuY2UYByAB" + 
-          "KAwiQQoMQ29sbGlzaW9uRW5kEhEKCXRpbWVzdGFtcBgCIAEoBhIeChZvdGhl" + 
-          "cl9vYmplY3RfcmVmZXJlbmNlGAYgASgM");
-      pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) {
-        descriptor = root;
-        internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionBegin__Descriptor = Descriptor.MessageTypes[0];
-        internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionBegin__FieldAccessorTable = 
-            new pb::FieldAccess.FieldAccessorTable<global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionBegin, global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionBegin.Builder>(internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionBegin__Descriptor,
-                new string[] { "Timestamp", "ThisPosition", "OtherPosition", "ThisNormal", "Impulse", "OtherObjectReference", });
-        internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionEnd__Descriptor = Descriptor.MessageTypes[1];
-        internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionEnd__FieldAccessorTable = 
-            new pb::FieldAccess.FieldAccessorTable<global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionEnd, global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionEnd.Builder>(internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionEnd__Descriptor,
-                new string[] { "Timestamp", "OtherObjectReference", });
-        return null;
-      };
-      pbd::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
-          new pbd::FileDescriptor[] {
-          }, assigner);
-    }
-    #endregion
-    
-  }
-  #region Messages
-  public sealed partial class CollisionBegin : pb::GeneratedMessage<CollisionBegin, CollisionBegin.Builder> {
-    private static readonly CollisionBegin defaultInstance = new Builder().BuildPartial();
-    public static CollisionBegin DefaultInstance {
-      get { return defaultInstance; }
-    }
-    
-    public override CollisionBegin DefaultInstanceForType {
-      get { return defaultInstance; }
-    }
-    
-    protected override CollisionBegin ThisMessage {
-      get { return this; }
-    }
-    
-    public static pbd::MessageDescriptor Descriptor {
-      get { return global::Sirikata.Physics.Protocol._PBJ_Internal.Physics.internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionBegin__Descriptor; }
-    }
-    
-    protected override pb::FieldAccess.FieldAccessorTable<CollisionBegin, CollisionBegin.Builder> InternalFieldAccessors {
-      get { return global::Sirikata.Physics.Protocol._PBJ_Internal.Physics.internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionBegin__FieldAccessorTable; }
-    }
-    
-    public const int TimestampFieldNumber = 2;
-    private bool hasTimestamp;
-    private ulong timestamp_ = 0;
-    public bool HasTimestamp {
-      get { return hasTimestamp; }
-    }
-    [global::System.CLSCompliant(false)]
-    public ulong Timestamp {
-      get { return timestamp_; }
-    }
-    
-    public const int ThisPositionFieldNumber = 3;
-    private int thisPositionMemoizedSerializedSize;
-    private pbc::PopsicleList<double> thisPosition_ = new pbc::PopsicleList<double>();
-    public scg::IList<double> ThisPositionList {
-      get { return pbc::Lists.AsReadOnly(thisPosition_); }
-    }
-    public int ThisPositionCount {
-      get { return thisPosition_.Count; }
-    }
-    public double GetThisPosition(int index) {
-      return thisPosition_[index];
-    }
-    
-    public const int OtherPositionFieldNumber = 4;
-    private int otherPositionMemoizedSerializedSize;
-    private pbc::PopsicleList<double> otherPosition_ = new pbc::PopsicleList<double>();
-    public scg::IList<double> OtherPositionList {
-      get { return pbc::Lists.AsReadOnly(otherPosition_); }
-    }
-    public int OtherPositionCount {
-      get { return otherPosition_.Count; }
-    }
-    public double GetOtherPosition(int index) {
-      return otherPosition_[index];
-    }
-    
-    public const int ThisNormalFieldNumber = 5;
-    private int thisNormalMemoizedSerializedSize;
-    private pbc::PopsicleList<float> thisNormal_ = new pbc::PopsicleList<float>();
-    public scg::IList<float> ThisNormalList {
-      get { return pbc::Lists.AsReadOnly(thisNormal_); }
-    }
-    public int ThisNormalCount {
-      get { return thisNormal_.Count; }
-    }
-    public float GetThisNormal(int index) {
-      return thisNormal_[index];
-    }
-    
-    public const int ImpulseFieldNumber = 6;
-    private int impulseMemoizedSerializedSize;
-    private pbc::PopsicleList<float> impulse_ = new pbc::PopsicleList<float>();
-    public scg::IList<float> ImpulseList {
-      get { return pbc::Lists.AsReadOnly(impulse_); }
-    }
-    public int ImpulseCount {
-      get { return impulse_.Count; }
-    }
-    public float GetImpulse(int index) {
-      return impulse_[index];
-    }
-    
-    public const int OtherObjectReferenceFieldNumber = 7;
-    private bool hasOtherObjectReference;
-    private pb::ByteString otherObjectReference_ = pb::ByteString.Empty;
-    public bool HasOtherObjectReference {
-      get { return hasOtherObjectReference; }
-    }
-    public pb::ByteString OtherObjectReference {
-      get { return otherObjectReference_; }
-    }
-    
-    public override bool IsInitialized {
-      get {
-        return true;
-      }
-    }
-    
-    public override void WriteTo(pb::CodedOutputStream output) {
-      if (HasTimestamp) {
-        output.WriteFixed64(2, Timestamp);
-      }
-      if (thisPosition_.Count > 0) {
-        output.WriteRawVarint32(26);
-        output.WriteRawVarint32((uint) thisPositionMemoizedSerializedSize);
-        foreach (double element in thisPosition_) {
-          output.WriteDoubleNoTag(element);
-        }
-      }
-      if (otherPosition_.Count > 0) {
-        output.WriteRawVarint32(34);
-        output.WriteRawVarint32((uint) otherPositionMemoizedSerializedSize);
-        foreach (double element in otherPosition_) {
-          output.WriteDoubleNoTag(element);
-        }
-      }
-      if (thisNormal_.Count > 0) {
-        output.WriteRawVarint32(42);
-        output.WriteRawVarint32((uint) thisNormalMemoizedSerializedSize);
-        foreach (float element in thisNormal_) {
-          output.WriteFloatNoTag(element);
-        }
-      }
-      if (impulse_.Count > 0) {
-        output.WriteRawVarint32(50);
-        output.WriteRawVarint32((uint) impulseMemoizedSerializedSize);
-        foreach (float element in impulse_) {
-          output.WriteFloatNoTag(element);
-        }
-      }
-      if (HasOtherObjectReference) {
-        output.WriteBytes(7, OtherObjectReference);
-      }
-      UnknownFields.WriteTo(output);
-    }
-    
-    private int memoizedSerializedSize = -1;
-    public override int SerializedSize {
-      get {
-        int size = memoizedSerializedSize;
-        if (size != -1) return size;
-        
-        size = 0;
-        if (HasTimestamp) {
-          size += pb::CodedOutputStream.ComputeFixed64Size(2, Timestamp);
-        }
-        {
-          int dataSize = 0;
-          dataSize = 8 * thisPosition_.Count;
-          size += dataSize;
-          if (thisPosition_.Count!=0) size += 1 + pb::CodedOutputStream.ComputeInt32SizeNoTag(dataSize);
-          thisPositionMemoizedSerializedSize = dataSize;
-        }
-        {
-          int dataSize = 0;
-          dataSize = 8 * otherPosition_.Count;
-          size += dataSize;
-          if (otherPosition_.Count!=0) size += 1 + pb::CodedOutputStream.ComputeInt32SizeNoTag(dataSize);
-          otherPositionMemoizedSerializedSize = dataSize;
-        }
-        {
-          int dataSize = 0;
-          dataSize = 4 * thisNormal_.Count;
-          size += dataSize;
-          if (thisNormal_.Count!=0) size += 1 + pb::CodedOutputStream.ComputeInt32SizeNoTag(dataSize);
-          thisNormalMemoizedSerializedSize = dataSize;
-        }
-        {
-          int dataSize = 0;
-          dataSize = 4 * impulse_.Count;
-          size += dataSize;
-          if (impulse_.Count!=0) size += 1 + pb::CodedOutputStream.ComputeInt32SizeNoTag(dataSize);
-          impulseMemoizedSerializedSize = dataSize;
-        }
-        if (HasOtherObjectReference) {
-          size += pb::CodedOutputStream.ComputeBytesSize(7, OtherObjectReference);
-        }
-        size += UnknownFields.SerializedSize;
-        memoizedSerializedSize = size;
-        return size;
-      }
-    }
-    
-    public static CollisionBegin ParseFrom(pb::ByteString data) {
-      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static CollisionBegin ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static CollisionBegin ParseFrom(byte[] data) {
-      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static CollisionBegin ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static CollisionBegin ParseFrom(global::System.IO.Stream input) {
-      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static CollisionBegin ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    public static CollisionBegin ParseDelimitedFrom(global::System.IO.Stream input) {
-      return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
-    }
-    public static CollisionBegin ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
-      return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
-    }
-    public static CollisionBegin ParseFrom(pb::CodedInputStream input) {
-      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static CollisionBegin ParseFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    public static Builder CreateBuilder() { return new Builder(); }
-    public override Builder ToBuilder() { return CreateBuilder(this); }
-    public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(CollisionBegin prototype) {
-      return (Builder) new Builder().MergeFrom(prototype);
-    }
-    
-    public sealed partial class Builder : pb::GeneratedBuilder<CollisionBegin, Builder> {
-      protected override Builder ThisBuilder {
-        get { return this; }
-      }
-      public Builder() {}
-      
-      CollisionBegin result = new CollisionBegin();
-      
-      protected override CollisionBegin MessageBeingBuilt {
-        get { return result; }
-      }
-      
-      public override Builder Clear() {
-        result = new CollisionBegin();
-        return this;
-      }
-      
-      public override Builder Clone() {
-        return new Builder().MergeFrom(result);
-      }
-      
-      public override pbd::MessageDescriptor DescriptorForType {
-        get { return global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionBegin.Descriptor; }
-      }
-      
-      public override CollisionBegin DefaultInstanceForType {
-        get { return global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionBegin.DefaultInstance; }
-      }
-      
-      public override CollisionBegin BuildPartial() {
-        if (result == null) {
-          throw new global::System.InvalidOperationException("build() has already been called on this Builder");
-        }
-        result.thisPosition_.MakeReadOnly();
-        result.otherPosition_.MakeReadOnly();
-        result.thisNormal_.MakeReadOnly();
-        result.impulse_.MakeReadOnly();
-        CollisionBegin returnMe = result;
-        result = null;
-        return returnMe;
-      }
-      
-      public override Builder MergeFrom(pb::IMessage other) {
-        if (other is CollisionBegin) {
-          return MergeFrom((CollisionBegin) other);
-        } else {
-          base.MergeFrom(other);
-          return this;
-        }
-      }
-      
-      public override Builder MergeFrom(CollisionBegin other) {
-        if (other == global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionBegin.DefaultInstance) return this;
-        if (other.HasTimestamp) {
-          Timestamp = other.Timestamp;
-        }
-        if (other.thisPosition_.Count != 0) {
-          base.AddRange(other.thisPosition_, result.thisPosition_);
-        }
-        if (other.otherPosition_.Count != 0) {
-          base.AddRange(other.otherPosition_, result.otherPosition_);
-        }
-        if (other.thisNormal_.Count != 0) {
-          base.AddRange(other.thisNormal_, result.thisNormal_);
-        }
-        if (other.impulse_.Count != 0) {
-          base.AddRange(other.impulse_, result.impulse_);
-        }
-        if (other.HasOtherObjectReference) {
-          OtherObjectReference = other.OtherObjectReference;
-        }
-        this.MergeUnknownFields(other.UnknownFields);
-        return this;
-      }
-      
-      public override Builder MergeFrom(pb::CodedInputStream input) {
-        return MergeFrom(input, pb::ExtensionRegistry.Empty);
-      }
-      
-      public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
-        pb::UnknownFieldSet.Builder unknownFields = null;
-        while (true) {
-          uint tag = input.ReadTag();
-          switch (tag) {
-            case 0: {
-              if (unknownFields != null) {
-                this.UnknownFields = unknownFields.Build();
-              }
-              return this;
-            }
-            default: {
-              if (pb::WireFormat.IsEndGroupTag(tag)) {
-                if (unknownFields != null) {
-                  this.UnknownFields = unknownFields.Build();
-                }
-                return this;
-              }
-              if (unknownFields == null) {
-                unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-              }
-              ParseUnknownField(input, unknownFields, extensionRegistry, tag);
-              break;
-            }
-            case 17: {
-              Timestamp = input.ReadFixed64();
-              break;
-            }
-            case 26: {
-              int length = input.ReadInt32();
-              int limit = input.PushLimit(length);
-              while (!input.ReachedLimit) {
-                AddThisPosition(input.ReadDouble());
-              }
-              input.PopLimit(limit);
-              break;
-            }
-            case 34: {
-              int length = input.ReadInt32();
-              int limit = input.PushLimit(length);
-              while (!input.ReachedLimit) {
-                AddOtherPosition(input.ReadDouble());
-              }
-              input.PopLimit(limit);
-              break;
-            }
-            case 42: {
-              int length = input.ReadInt32();
-              int limit = input.PushLimit(length);
-              while (!input.ReachedLimit) {
-                AddThisNormal(input.ReadFloat());
-              }
-              input.PopLimit(limit);
-              break;
-            }
-            case 50: {
-              int length = input.ReadInt32();
-              int limit = input.PushLimit(length);
-              while (!input.ReachedLimit) {
-                AddImpulse(input.ReadFloat());
-              }
-              input.PopLimit(limit);
-              break;
-            }
-            case 58: {
-              OtherObjectReference = input.ReadBytes();
-              break;
-            }
-          }
-        }
-      }
-      
-      
-      public bool HasTimestamp {
-        get { return result.HasTimestamp; }
-      }
-      [global::System.CLSCompliant(false)]
-      public ulong Timestamp {
-        get { return result.Timestamp; }
-        set { SetTimestamp(value); }
-      }
-      [global::System.CLSCompliant(false)]
-      public Builder SetTimestamp(ulong value) {
-        result.hasTimestamp = true;
-        result.timestamp_ = value;
-        return this;
-      }
-      public Builder ClearTimestamp() {
-        result.hasTimestamp = false;
-        result.timestamp_ = 0;
-        return this;
-      }
-      
-      public pbc::IPopsicleList<double> ThisPositionList {
-        get { return result.thisPosition_; }
-      }
-      public int ThisPositionCount {
-        get { return result.ThisPositionCount; }
-      }
-      public double GetThisPosition(int index) {
-        return result.GetThisPosition(index);
-      }
-      public Builder SetThisPosition(int index, double value) {
-        result.thisPosition_[index] = value;
-        return this;
-      }
-      public Builder AddThisPosition(double value) {
-        result.thisPosition_.Add(value);
-        return this;
-      }
-      public Builder AddRangeThisPosition(scg::IEnumerable<double> values) {
-        base.AddRange(values, result.thisPosition_);
-        return this;
-      }
-      public Builder ClearThisPosition() {
-        result.thisPosition_.Clear();
-        return this;
-      }
-      
-      public pbc::IPopsicleList<double> OtherPositionList {
-        get { return result.otherPosition_; }
-      }
-      public int OtherPositionCount {
-        get { return result.OtherPositionCount; }
-      }
-      public double GetOtherPosition(int index) {
-        return result.GetOtherPosition(index);
-      }
-      public Builder SetOtherPosition(int index, double value) {
-        result.otherPosition_[index] = value;
-        return this;
-      }
-      public Builder AddOtherPosition(double value) {
-        result.otherPosition_.Add(value);
-        return this;
-      }
-      public Builder AddRangeOtherPosition(scg::IEnumerable<double> values) {
-        base.AddRange(values, result.otherPosition_);
-        return this;
-      }
-      public Builder ClearOtherPosition() {
-        result.otherPosition_.Clear();
-        return this;
-      }
-      
-      public pbc::IPopsicleList<float> ThisNormalList {
-        get { return result.thisNormal_; }
-      }
-      public int ThisNormalCount {
-        get { return result.ThisNormalCount; }
-      }
-      public float GetThisNormal(int index) {
-        return result.GetThisNormal(index);
-      }
-      public Builder SetThisNormal(int index, float value) {
-        result.thisNormal_[index] = value;
-        return this;
-      }
-      public Builder AddThisNormal(float value) {
-        result.thisNormal_.Add(value);
-        return this;
-      }
-      public Builder AddRangeThisNormal(scg::IEnumerable<float> values) {
-        base.AddRange(values, result.thisNormal_);
-        return this;
-      }
-      public Builder ClearThisNormal() {
-        result.thisNormal_.Clear();
-        return this;
-      }
-      
-      public pbc::IPopsicleList<float> ImpulseList {
-        get { return result.impulse_; }
-      }
-      public int ImpulseCount {
-        get { return result.ImpulseCount; }
-      }
-      public float GetImpulse(int index) {
-        return result.GetImpulse(index);
-      }
-      public Builder SetImpulse(int index, float value) {
-        result.impulse_[index] = value;
-        return this;
-      }
-      public Builder AddImpulse(float value) {
-        result.impulse_.Add(value);
-        return this;
-      }
-      public Builder AddRangeImpulse(scg::IEnumerable<float> values) {
-        base.AddRange(values, result.impulse_);
-        return this;
-      }
-      public Builder ClearImpulse() {
-        result.impulse_.Clear();
-        return this;
-      }
-      
-      public bool HasOtherObjectReference {
-        get { return result.HasOtherObjectReference; }
-      }
-      public pb::ByteString OtherObjectReference {
-        get { return result.OtherObjectReference; }
-        set { SetOtherObjectReference(value); }
-      }
-      public Builder SetOtherObjectReference(pb::ByteString value) {
-        pb::ThrowHelper.ThrowIfNull(value, "value");
-        result.hasOtherObjectReference = true;
-        result.otherObjectReference_ = value;
-        return this;
-      }
-      public Builder ClearOtherObjectReference() {
-        result.hasOtherObjectReference = false;
-        result.otherObjectReference_ = pb::ByteString.Empty;
-        return this;
-      }
-    }
-    static CollisionBegin() {
-      object.ReferenceEquals(global::Sirikata.Physics.Protocol._PBJ_Internal.Physics.Descriptor, null);
-    }
-  }
-  
-  public sealed partial class CollisionEnd : pb::GeneratedMessage<CollisionEnd, CollisionEnd.Builder> {
-    private static readonly CollisionEnd defaultInstance = new Builder().BuildPartial();
-    public static CollisionEnd DefaultInstance {
-      get { return defaultInstance; }
-    }
-    
-    public override CollisionEnd DefaultInstanceForType {
-      get { return defaultInstance; }
-    }
-    
-    protected override CollisionEnd ThisMessage {
-      get { return this; }
-    }
-    
-    public static pbd::MessageDescriptor Descriptor {
-      get { return global::Sirikata.Physics.Protocol._PBJ_Internal.Physics.internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionEnd__Descriptor; }
-    }
-    
-    protected override pb::FieldAccess.FieldAccessorTable<CollisionEnd, CollisionEnd.Builder> InternalFieldAccessors {
-      get { return global::Sirikata.Physics.Protocol._PBJ_Internal.Physics.internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionEnd__FieldAccessorTable; }
-    }
-    
-    public const int TimestampFieldNumber = 2;
-    private bool hasTimestamp;
-    private ulong timestamp_ = 0;
-    public bool HasTimestamp {
-      get { return hasTimestamp; }
-    }
-    [global::System.CLSCompliant(false)]
-    public ulong Timestamp {
-      get { return timestamp_; }
-    }
-    
-    public const int OtherObjectReferenceFieldNumber = 6;
-    private bool hasOtherObjectReference;
-    private pb::ByteString otherObjectReference_ = pb::ByteString.Empty;
-    public bool HasOtherObjectReference {
-      get { return hasOtherObjectReference; }
-    }
-    public pb::ByteString OtherObjectReference {
-      get { return otherObjectReference_; }
-    }
-    
-    public override bool IsInitialized {
-      get {
-        return true;
-      }
-    }
-    
-    public override void WriteTo(pb::CodedOutputStream output) {
-      if (HasTimestamp) {
-        output.WriteFixed64(2, Timestamp);
-      }
-      if (HasOtherObjectReference) {
-        output.WriteBytes(6, OtherObjectReference);
-      }
-      UnknownFields.WriteTo(output);
-    }
-    
-    private int memoizedSerializedSize = -1;
-    public override int SerializedSize {
-      get {
-        int size = memoizedSerializedSize;
-        if (size != -1) return size;
-        
-        size = 0;
-        if (HasTimestamp) {
-          size += pb::CodedOutputStream.ComputeFixed64Size(2, Timestamp);
-        }
-        if (HasOtherObjectReference) {
-          size += pb::CodedOutputStream.ComputeBytesSize(6, OtherObjectReference);
-        }
-        size += UnknownFields.SerializedSize;
-        memoizedSerializedSize = size;
-        return size;
-      }
-    }
-    
-    public static CollisionEnd ParseFrom(pb::ByteString data) {
-      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static CollisionEnd ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static CollisionEnd ParseFrom(byte[] data) {
-      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static CollisionEnd ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static CollisionEnd ParseFrom(global::System.IO.Stream input) {
-      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static CollisionEnd ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    public static CollisionEnd ParseDelimitedFrom(global::System.IO.Stream input) {
-      return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
-    }
-    public static CollisionEnd ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
-      return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
-    }
-    public static CollisionEnd ParseFrom(pb::CodedInputStream input) {
-      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static CollisionEnd ParseFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    public static Builder CreateBuilder() { return new Builder(); }
-    public override Builder ToBuilder() { return CreateBuilder(this); }
-    public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(CollisionEnd prototype) {
-      return (Builder) new Builder().MergeFrom(prototype);
-    }
-    
-    public sealed partial class Builder : pb::GeneratedBuilder<CollisionEnd, Builder> {
-      protected override Builder ThisBuilder {
-        get { return this; }
-      }
-      public Builder() {}
-      
-      CollisionEnd result = new CollisionEnd();
-      
-      protected override CollisionEnd MessageBeingBuilt {
-        get { return result; }
-      }
-      
-      public override Builder Clear() {
-        result = new CollisionEnd();
-        return this;
-      }
-      
-      public override Builder Clone() {
-        return new Builder().MergeFrom(result);
-      }
-      
-      public override pbd::MessageDescriptor DescriptorForType {
-        get { return global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionEnd.Descriptor; }
-      }
-      
-      public override CollisionEnd DefaultInstanceForType {
-        get { return global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionEnd.DefaultInstance; }
-      }
-      
-      public override CollisionEnd BuildPartial() {
-        if (result == null) {
-          throw new global::System.InvalidOperationException("build() has already been called on this Builder");
-        }
-        CollisionEnd returnMe = result;
-        result = null;
-        return returnMe;
-      }
-      
-      public override Builder MergeFrom(pb::IMessage other) {
-        if (other is CollisionEnd) {
-          return MergeFrom((CollisionEnd) other);
-        } else {
-          base.MergeFrom(other);
-          return this;
-        }
-      }
-      
-      public override Builder MergeFrom(CollisionEnd other) {
-        if (other == global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionEnd.DefaultInstance) return this;
-        if (other.HasTimestamp) {
-          Timestamp = other.Timestamp;
-        }
-        if (other.HasOtherObjectReference) {
-          OtherObjectReference = other.OtherObjectReference;
-        }
-        this.MergeUnknownFields(other.UnknownFields);
-        return this;
-      }
-      
-      public override Builder MergeFrom(pb::CodedInputStream input) {
-        return MergeFrom(input, pb::ExtensionRegistry.Empty);
-      }
-      
-      public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
-        pb::UnknownFieldSet.Builder unknownFields = null;
-        while (true) {
-          uint tag = input.ReadTag();
-          switch (tag) {
-            case 0: {
-              if (unknownFields != null) {
-                this.UnknownFields = unknownFields.Build();
-              }
-              return this;
-            }
-            default: {
-              if (pb::WireFormat.IsEndGroupTag(tag)) {
-                if (unknownFields != null) {
-                  this.UnknownFields = unknownFields.Build();
-                }
-                return this;
-              }
-              if (unknownFields == null) {
-                unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-              }
-              ParseUnknownField(input, unknownFields, extensionRegistry, tag);
-              break;
-            }
-            case 17: {
-              Timestamp = input.ReadFixed64();
-              break;
-            }
-            case 50: {
-              OtherObjectReference = input.ReadBytes();
-              break;
-            }
-          }
-        }
-      }
-      
-      
-      public bool HasTimestamp {
-        get { return result.HasTimestamp; }
-      }
-      [global::System.CLSCompliant(false)]
-      public ulong Timestamp {
-        get { return result.Timestamp; }
-        set { SetTimestamp(value); }
-      }
-      [global::System.CLSCompliant(false)]
-      public Builder SetTimestamp(ulong value) {
-        result.hasTimestamp = true;
-        result.timestamp_ = value;
-        return this;
-      }
-      public Builder ClearTimestamp() {
-        result.hasTimestamp = false;
-        result.timestamp_ = 0;
-        return this;
-      }
-      
-      public bool HasOtherObjectReference {
-        get { return result.HasOtherObjectReference; }
-      }
-      public pb::ByteString OtherObjectReference {
-        get { return result.OtherObjectReference; }
-        set { SetOtherObjectReference(value); }
-      }
-      public Builder SetOtherObjectReference(pb::ByteString value) {
-        pb::ThrowHelper.ThrowIfNull(value, "value");
-        result.hasOtherObjectReference = true;
-        result.otherObjectReference_ = value;
-        return this;
-      }
-      public Builder ClearOtherObjectReference() {
-        result.hasOtherObjectReference = false;
-        result.otherObjectReference_ = pb::ByteString.Empty;
-        return this;
-      }
-    }
-    static CollisionEnd() {
-      object.ReferenceEquals(global::Sirikata.Physics.Protocol._PBJ_Internal.Physics.Descriptor, null);
-    }
-  }
-  
-  #endregion
-  
-}
--- a/OpenSim/Client/Sirikata/Protocol/Physics.pbj.cs
+++ b/OpenSim/Client/Sirikata/Protocol/Physics.pbj.cs
@@ -1,421 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using pbd = global::Google.ProtocolBuffers.Descriptors;
-using pb = global::Google.ProtocolBuffers;
-namespace Sirikata.Physics.Protocol {
-    public class CollisionBegin : PBJ.IMessage {
-        protected _PBJ_Internal.CollisionBegin super;
-        public _PBJ_Internal.CollisionBegin _PBJSuper{ get { return super;} }
-        public CollisionBegin() {
-            super=new _PBJ_Internal.CollisionBegin();
-        }
-        public CollisionBegin(_PBJ_Internal.CollisionBegin reference) {
-            super=reference;
-        }
-        public static CollisionBegin defaultInstance= new CollisionBegin (_PBJ_Internal.CollisionBegin.DefaultInstance);
-        public static CollisionBegin DefaultInstance{
-            get {return defaultInstance;}
-        }
-        public static pbd.MessageDescriptor Descriptor {
-            get { return _PBJ_Internal.CollisionBegin.Descriptor; }        }
-        public static class Types {
-        }
-        public static bool WithinReservedFieldTagRange(int field_tag) {
-            return false;
-        }
-        public static bool WithinExtensionFieldTagRange(int field_tag) {
-            return false;
-        }
-        public const int TimestampFieldTag=2;
-        public bool HasTimestamp{ get {return super.HasTimestamp&&PBJ._PBJ.ValidateTime(super.Timestamp);} }
-        public PBJ.Time Timestamp{ get {
-            if (HasTimestamp) {
-                return PBJ._PBJ.CastTime(super.Timestamp);
-            } else {
-                return PBJ._PBJ.CastTime();
-            }
-        }
-        }
-        public const int ThisPositionFieldTag=3;
-        public int ThisPositionCount { get { return super.ThisPositionCount/3;} }
-        public bool HasThisPosition(int index) { return true; }
-        public PBJ.Vector3d GetThisPosition(int index) {
-            if (HasThisPosition(index)) {
-                return PBJ._PBJ.CastVector3d(super.GetThisPosition(index*3+0),super.GetThisPosition(index*3+1),super.GetThisPosition(index*3+2));
-            } else {
-                return PBJ._PBJ.CastVector3d();
-            }
-        }
-        public const int OtherPositionFieldTag=4;
-        public int OtherPositionCount { get { return super.OtherPositionCount/3;} }
-        public bool HasOtherPosition(int index) { return true; }
-        public PBJ.Vector3d GetOtherPosition(int index) {
-            if (HasOtherPosition(index)) {
-                return PBJ._PBJ.CastVector3d(super.GetOtherPosition(index*3+0),super.GetOtherPosition(index*3+1),super.GetOtherPosition(index*3+2));
-            } else {
-                return PBJ._PBJ.CastVector3d();
-            }
-        }
-        public const int ThisNormalFieldTag=5;
-        public int ThisNormalCount { get { return super.ThisNormalCount/2;} }
-        public bool HasThisNormal(int index) { return true; }
-        public PBJ.Vector3f GetThisNormal(int index) {
-            if (HasThisNormal(index)) {
-                return PBJ._PBJ.CastNormal(super.GetThisNormal(index*2+0),super.GetThisNormal(index*2+1));
-            } else {
-                return PBJ._PBJ.CastNormal();
-            }
-        }
-        public const int ImpulseFieldTag=6;
-        public int ImpulseCount { get { return super.ImpulseCount;} }
-        public bool HasImpulse(int index) {return PBJ._PBJ.ValidateFloat(super.GetImpulse(index));}
-        public float Impulse(int index) {
-            return (float)PBJ._PBJ.CastFloat(super.GetImpulse(index));
-        }
-        public const int OtherObjectReferenceFieldTag=7;
-        public bool HasOtherObjectReference{ get {return super.HasOtherObjectReference&&PBJ._PBJ.ValidateUuid(super.OtherObjectReference);} }
-        public PBJ.UUID OtherObjectReference{ get {
-            if (HasOtherObjectReference) {
-                return PBJ._PBJ.CastUuid(super.OtherObjectReference);
-            } else {
-                return PBJ._PBJ.CastUuid();
-            }
-        }
-        }
-            public override Google.ProtocolBuffers.IMessage _PBJISuper { get { return super; } }
-        public override PBJ.IMessage.IBuilder WeakCreateBuilderForType() { return new Builder(); }
-        public static Builder CreateBuilder() { return new Builder(); }
-        public static Builder CreateBuilder(CollisionBegin prototype) {
-            return (Builder)new Builder().MergeFrom(prototype);
-        }
-        public static CollisionBegin ParseFrom(pb::ByteString data) {
-            return new CollisionBegin(_PBJ_Internal.CollisionBegin.ParseFrom(data));
-        }
-        public static CollisionBegin ParseFrom(pb::ByteString data, pb::ExtensionRegistry er) {
-            return new CollisionBegin(_PBJ_Internal.CollisionBegin.ParseFrom(data,er));
-        }
-        public static CollisionBegin ParseFrom(byte[] data) {
-            return new CollisionBegin(_PBJ_Internal.CollisionBegin.ParseFrom(data));
-        }
-        public static CollisionBegin ParseFrom(byte[] data, pb::ExtensionRegistry er) {
-            return new CollisionBegin(_PBJ_Internal.CollisionBegin.ParseFrom(data,er));
-        }
-        public static CollisionBegin ParseFrom(global::System.IO.Stream data) {
-            return new CollisionBegin(_PBJ_Internal.CollisionBegin.ParseFrom(data));
-        }
-        public static CollisionBegin ParseFrom(global::System.IO.Stream data, pb::ExtensionRegistry er) {
-            return new CollisionBegin(_PBJ_Internal.CollisionBegin.ParseFrom(data,er));
-        }
-        public static CollisionBegin ParseFrom(pb::CodedInputStream data) {
-            return new CollisionBegin(_PBJ_Internal.CollisionBegin.ParseFrom(data));
-        }
-        public static CollisionBegin ParseFrom(pb::CodedInputStream data, pb::ExtensionRegistry er) {
-            return new CollisionBegin(_PBJ_Internal.CollisionBegin.ParseFrom(data,er));
-        }
-        protected override bool _HasAllPBJFields{ get {
-            return true
-                ;
-        } }
-        public bool IsInitialized { get {
-            return super.IsInitialized&&_HasAllPBJFields;
-        } }
-        public class Builder : global::PBJ.IMessage.IBuilder{
-        protected override bool _HasAllPBJFields{ get {
-            return true
-                ;
-        } }
-        public bool IsInitialized { get {
-            return super.IsInitialized&&_HasAllPBJFields;
-        } }
-            protected _PBJ_Internal.CollisionBegin.Builder super;
-            public override Google.ProtocolBuffers.IBuilder _PBJISuper { get { return super; } }
-            public _PBJ_Internal.CollisionBegin.Builder _PBJSuper{ get { return super;} }
-            public Builder() {super = new _PBJ_Internal.CollisionBegin.Builder();}
-            public Builder(_PBJ_Internal.CollisionBegin.Builder other) {
-                super=other;
-            }
-            public Builder Clone() {return new Builder(super.Clone());}
-            public Builder MergeFrom(CollisionBegin prototype) { super.MergeFrom(prototype._PBJSuper);return this;}
-            public Builder Clear() {super.Clear();return this;}
-            public CollisionBegin BuildPartial() {return new CollisionBegin(super.BuildPartial());}
-            public CollisionBegin Build() {if (_HasAllPBJFields) return new CollisionBegin(super.Build());return null;}
-            public pbd::MessageDescriptor DescriptorForType {
-                get { return CollisionBegin.Descriptor; }            }
-        public Builder ClearTimestamp() { super.ClearTimestamp();return this;}
-        public const int TimestampFieldTag=2;
-        public bool HasTimestamp{ get {return super.HasTimestamp&&PBJ._PBJ.ValidateTime(super.Timestamp);} }
-        public PBJ.Time Timestamp{ get {
-            if (HasTimestamp) {
-                return PBJ._PBJ.CastTime(super.Timestamp);
-            } else {
-                return PBJ._PBJ.CastTime();
-            }
-        }
-        set {
-            super.Timestamp=(PBJ._PBJ.Construct(value));
-        }
-        }
-        public Builder ClearThisPosition() { super.ClearThisPosition();return this;}
-        public const int ThisPositionFieldTag=3;
-        public int ThisPositionCount { get { return super.ThisPositionCount/3;} }
-        public bool HasThisPosition(int index) { return true; }
-        public PBJ.Vector3d GetThisPosition(int index) {
-            if (HasThisPosition(index)) {
-                return PBJ._PBJ.CastVector3d(super.GetThisPosition(index*3+0),super.GetThisPosition(index*3+1),super.GetThisPosition(index*3+2));
-            } else {
-                return PBJ._PBJ.CastVector3d();
-            }
-        }
-        public Builder AddThisPosition(PBJ.Vector3d value) {
-            double[] _PBJtempArray=PBJ._PBJ.ConstructVector3d(value);
-            super.AddThisPosition(_PBJtempArray[0]);
-            super.AddThisPosition(_PBJtempArray[1]);
-            super.AddThisPosition(_PBJtempArray[2]);
-            return this;
-        }
-        public Builder SetThisPosition(int index,PBJ.Vector3d value) {
-            double[] _PBJtempArray=PBJ._PBJ.ConstructVector3d(value);
-            super.SetThisPosition(index*3+0,_PBJtempArray[0]);
-            super.SetThisPosition(index*3+1,_PBJtempArray[1]);
-            super.SetThisPosition(index*3+2,_PBJtempArray[2]);
-            return this;
-        }
-        public Builder ClearOtherPosition() { super.ClearOtherPosition();return this;}
-        public const int OtherPositionFieldTag=4;
-        public int OtherPositionCount { get { return super.OtherPositionCount/3;} }
-        public bool HasOtherPosition(int index) { return true; }
-        public PBJ.Vector3d GetOtherPosition(int index) {
-            if (HasOtherPosition(index)) {
-                return PBJ._PBJ.CastVector3d(super.GetOtherPosition(index*3+0),super.GetOtherPosition(index*3+1),super.GetOtherPosition(index*3+2));
-            } else {
-                return PBJ._PBJ.CastVector3d();
-            }
-        }
-        public Builder AddOtherPosition(PBJ.Vector3d value) {
-            double[] _PBJtempArray=PBJ._PBJ.ConstructVector3d(value);
-            super.AddOtherPosition(_PBJtempArray[0]);
-            super.AddOtherPosition(_PBJtempArray[1]);
-            super.AddOtherPosition(_PBJtempArray[2]);
-            return this;
-        }
-        public Builder SetOtherPosition(int index,PBJ.Vector3d value) {
-            double[] _PBJtempArray=PBJ._PBJ.ConstructVector3d(value);
-            super.SetOtherPosition(index*3+0,_PBJtempArray[0]);
-            super.SetOtherPosition(index*3+1,_PBJtempArray[1]);
-            super.SetOtherPosition(index*3+2,_PBJtempArray[2]);
-            return this;
-        }
-        public Builder ClearThisNormal() { super.ClearThisNormal();return this;}
-        public const int ThisNormalFieldTag=5;
-        public int ThisNormalCount { get { return super.ThisNormalCount/2;} }
-        public bool HasThisNormal(int index) { return true; }
-        public PBJ.Vector3f GetThisNormal(int index) {
-            if (HasThisNormal(index)) {
-                return PBJ._PBJ.CastNormal(super.GetThisNormal(index*2+0),super.GetThisNormal(index*2+1));
-            } else {
-                return PBJ._PBJ.CastNormal();
-            }
-        }
-        public Builder AddThisNormal(PBJ.Vector3f value) {
-            float[] _PBJtempArray=PBJ._PBJ.ConstructNormal(value);
-            super.AddThisNormal(_PBJtempArray[0]);
-            super.AddThisNormal(_PBJtempArray[1]);
-            return this;
-        }
-        public Builder SetThisNormal(int index,PBJ.Vector3f value) {
-            float[] _PBJtempArray=PBJ._PBJ.ConstructNormal(value);
-            super.SetThisNormal(index*2+0,_PBJtempArray[0]);
-            super.SetThisNormal(index*2+1,_PBJtempArray[1]);
-            return this;
-        }
-        public Builder ClearImpulse() { super.ClearImpulse();return this;}
-        public Builder SetImpulse(int index, float value) {
-            super.SetImpulse(index,PBJ._PBJ.Construct(value));
-            return this;
-        }
-        public const int ImpulseFieldTag=6;
-        public int ImpulseCount { get { return super.ImpulseCount;} }
-        public bool HasImpulse(int index) {return PBJ._PBJ.ValidateFloat(super.GetImpulse(index));}
-        public float Impulse(int index) {
-            return (float)PBJ._PBJ.CastFloat(super.GetImpulse(index));
-        }
-        public Builder AddImpulse(float value) {
-            super.AddImpulse(PBJ._PBJ.Construct(value));
-            return this;
-        }
-        public Builder ClearOtherObjectReference() { super.ClearOtherObjectReference();return this;}
-        public const int OtherObjectReferenceFieldTag=7;
-        public bool HasOtherObjectReference{ get {return super.HasOtherObjectReference&&PBJ._PBJ.ValidateUuid(super.OtherObjectReference);} }
-        public PBJ.UUID OtherObjectReference{ get {
-            if (HasOtherObjectReference) {
-                return PBJ._PBJ.CastUuid(super.OtherObjectReference);
-            } else {
-                return PBJ._PBJ.CastUuid();
-            }
-        }
-        set {
-            super.OtherObjectReference=(PBJ._PBJ.Construct(value));
-        }
-        }
-        }
-    }
-}
-namespace Sirikata.Physics.Protocol {
-    public class CollisionEnd : PBJ.IMessage {
-        protected _PBJ_Internal.CollisionEnd super;
-        public _PBJ_Internal.CollisionEnd _PBJSuper{ get { return super;} }
-        public CollisionEnd() {
-            super=new _PBJ_Internal.CollisionEnd();
-        }
-        public CollisionEnd(_PBJ_Internal.CollisionEnd reference) {
-            super=reference;
-        }
-        public static CollisionEnd defaultInstance= new CollisionEnd (_PBJ_Internal.CollisionEnd.DefaultInstance);
-        public static CollisionEnd DefaultInstance{
-            get {return defaultInstance;}
-        }
-        public static pbd.MessageDescriptor Descriptor {
-            get { return _PBJ_Internal.CollisionEnd.Descriptor; }        }
-        public static class Types {
-        }
-        public static bool WithinReservedFieldTagRange(int field_tag) {
-            return false;
-        }
-        public static bool WithinExtensionFieldTagRange(int field_tag) {
-            return false;
-        }
-        public const int TimestampFieldTag=2;
-        public bool HasTimestamp{ get {return super.HasTimestamp&&PBJ._PBJ.ValidateTime(super.Timestamp);} }
-        public PBJ.Time Timestamp{ get {
-            if (HasTimestamp) {
-                return PBJ._PBJ.CastTime(super.Timestamp);
-            } else {
-                return PBJ._PBJ.CastTime();
-            }
-        }
-        }
-        public const int OtherObjectReferenceFieldTag=6;
-        public bool HasOtherObjectReference{ get {return super.HasOtherObjectReference&&PBJ._PBJ.ValidateUuid(super.OtherObjectReference);} }
-        public PBJ.UUID OtherObjectReference{ get {
-            if (HasOtherObjectReference) {
-                return PBJ._PBJ.CastUuid(super.OtherObjectReference);
-            } else {
-                return PBJ._PBJ.CastUuid();
-            }
-        }
-        }
-            public override Google.ProtocolBuffers.IMessage _PBJISuper { get { return super; } }
-        public override PBJ.IMessage.IBuilder WeakCreateBuilderForType() { return new Builder(); }
-        public static Builder CreateBuilder() { return new Builder(); }
-        public static Builder CreateBuilder(CollisionEnd prototype) {
-            return (Builder)new Builder().MergeFrom(prototype);
-        }
-        public static CollisionEnd ParseFrom(pb::ByteString data) {
-            return new CollisionEnd(_PBJ_Internal.CollisionEnd.ParseFrom(data));
-        }
-        public static CollisionEnd ParseFrom(pb::ByteString data, pb::ExtensionRegistry er) {
-            return new CollisionEnd(_PBJ_Internal.CollisionEnd.ParseFrom(data,er));
-        }
-        public static CollisionEnd ParseFrom(byte[] data) {
-            return new CollisionEnd(_PBJ_Internal.CollisionEnd.ParseFrom(data));
-        }
-        public static CollisionEnd ParseFrom(byte[] data, pb::ExtensionRegistry er) {
-            return new CollisionEnd(_PBJ_Internal.CollisionEnd.ParseFrom(data,er));
-        }
-        public static CollisionEnd ParseFrom(global::System.IO.Stream data) {
-            return new CollisionEnd(_PBJ_Internal.CollisionEnd.ParseFrom(data));
-        }
-        public static CollisionEnd ParseFrom(global::System.IO.Stream data, pb::ExtensionRegistry er) {
-            return new CollisionEnd(_PBJ_Internal.CollisionEnd.ParseFrom(data,er));
-        }
-        public static CollisionEnd ParseFrom(pb::CodedInputStream data) {
-            return new CollisionEnd(_PBJ_Internal.CollisionEnd.ParseFrom(data));
-        }
-        public static CollisionEnd ParseFrom(pb::CodedInputStream data, pb::ExtensionRegistry er) {
-            return new CollisionEnd(_PBJ_Internal.CollisionEnd.ParseFrom(data,er));
-        }
-        protected override bool _HasAllPBJFields{ get {
-            return true
-                ;
-        } }
-        public bool IsInitialized { get {
-            return super.IsInitialized&&_HasAllPBJFields;
-        } }
-        public class Builder : global::PBJ.IMessage.IBuilder{
-        protected override bool _HasAllPBJFields{ get {
-            return true
-                ;
-        } }
-        public bool IsInitialized { get {
-            return super.IsInitialized&&_HasAllPBJFields;
-        } }
-            protected _PBJ_Internal.CollisionEnd.Builder super;
-            public override Google.ProtocolBuffers.IBuilder _PBJISuper { get { return super; } }
-            public _PBJ_Internal.CollisionEnd.Builder _PBJSuper{ get { return super;} }
-            public Builder() {super = new _PBJ_Internal.CollisionEnd.Builder();}
-            public Builder(_PBJ_Internal.CollisionEnd.Builder other) {
-                super=other;
-            }
-            public Builder Clone() {return new Builder(super.Clone());}
-            public Builder MergeFrom(CollisionEnd prototype) { super.MergeFrom(prototype._PBJSuper);return this;}
-            public Builder Clear() {super.Clear();return this;}
-            public CollisionEnd BuildPartial() {return new CollisionEnd(super.BuildPartial());}
-            public CollisionEnd Build() {if (_HasAllPBJFields) return new CollisionEnd(super.Build());return null;}
-            public pbd::MessageDescriptor DescriptorForType {
-                get { return CollisionEnd.Descriptor; }            }
-        public Builder ClearTimestamp() { super.ClearTimestamp();return this;}
-        public const int TimestampFieldTag=2;
-        public bool HasTimestamp{ get {return super.HasTimestamp&&PBJ._PBJ.ValidateTime(super.Timestamp);} }
-        public PBJ.Time Timestamp{ get {
-            if (HasTimestamp) {
-                return PBJ._PBJ.CastTime(super.Timestamp);
-            } else {
-                return PBJ._PBJ.CastTime();
-            }
-        }
-        set {
-            super.Timestamp=(PBJ._PBJ.Construct(value));
-        }
-        }
-        public Builder ClearOtherObjectReference() { super.ClearOtherObjectReference();return this;}
-        public const int OtherObjectReferenceFieldTag=6;
-        public bool HasOtherObjectReference{ get {return super.HasOtherObjectReference&&PBJ._PBJ.ValidateUuid(super.OtherObjectReference);} }
-        public PBJ.UUID OtherObjectReference{ get {
-            if (HasOtherObjectReference) {
-                return PBJ._PBJ.CastUuid(super.OtherObjectReference);
-            } else {
-                return PBJ._PBJ.CastUuid();
-            }
-        }
-        set {
-            super.OtherObjectReference=(PBJ._PBJ.Construct(value));
-        }
-        }
-        }
-    }
-}
--- a/OpenSim/Client/Sirikata/Protocol/Sirikata.cs
+++ b/OpenSim/Client/Sirikata/Protocol/Sirikata.cs
--- a/OpenSim/Client/Sirikata/Protocol/Sirikata.pbj.cs
+++ b/OpenSim/Client/Sirikata/Protocol/Sirikata.pbj.cs
--- a/OpenSim/Client/Sirikata/Protocol/Subscription.cs
+++ b/OpenSim/Client/Sirikata/Protocol/Subscription.cs
@@ -1,856 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-using pb = global::Google.ProtocolBuffers;
-using pbc = global::Google.ProtocolBuffers.Collections;
-using pbd = global::Google.ProtocolBuffers.Descriptors;
-using scg = global::System.Collections.Generic;
-namespace Sirikata.Subscription.Protocol._PBJ_Internal {
-  
-  public static partial class Subscription {
-  
-    #region Extension registration
-    public static void RegisterAllExtensions(pb::ExtensionRegistry registry) {
-    }
-    #endregion
-    #region Static variables
-    internal static pbd::MessageDescriptor internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Address__Descriptor;
-    internal static pb::FieldAccess.FieldAccessorTable<global::Sirikata.Subscription.Protocol._PBJ_Internal.Address, global::Sirikata.Subscription.Protocol._PBJ_Internal.Address.Builder> internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Address__FieldAccessorTable;
-    internal static pbd::MessageDescriptor internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Subscribe__Descriptor;
-    internal static pb::FieldAccess.FieldAccessorTable<global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscribe, global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscribe.Builder> internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Subscribe__FieldAccessorTable;
-    internal static pbd::MessageDescriptor internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Broadcast__Descriptor;
-    internal static pb::FieldAccess.FieldAccessorTable<global::Sirikata.Subscription.Protocol._PBJ_Internal.Broadcast, global::Sirikata.Subscription.Protocol._PBJ_Internal.Broadcast.Builder> internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Broadcast__FieldAccessorTable;
-    #endregion
-    #region Descriptor
-    public static pbd::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbd::FileDescriptor descriptor;
-    
-    static Subscription() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          "ChJTdWJzY3JpcHRpb24ucHJvdG8SLFNpcmlrYXRhLlN1YnNjcmlwdGlvbi5Q" + 
-          "cm90b2NvbC5fUEJKX0ludGVybmFsIiwKB0FkZHJlc3MSEAoIaG9zdG5hbWUY" + 
-          "ASABKAkSDwoHc2VydmljZRgCIAEoCSKMAQoJU3Vic2NyaWJlElAKEWJyb2Fk" + 
-          "Y2FzdF9hZGRyZXNzGAcgASgLMjUuU2lyaWthdGEuU3Vic2NyaXB0aW9uLlBy" + 
-          "b3RvY29sLl9QQkpfSW50ZXJuYWwuQWRkcmVzcxIWCg5icm9hZGNhc3RfbmFt" + 
-          "ZRgIIAEoDBIVCg11cGRhdGVfcGVyaW9kGAkgASgQIiMKCUJyb2FkY2FzdBIW" + 
-          "Cg5icm9hZGNhc3RfbmFtZRgHIAEoDA==");
-      pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) {
-        descriptor = root;
-        internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Address__Descriptor = Descriptor.MessageTypes[0];
-        internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Address__FieldAccessorTable = 
-            new pb::FieldAccess.FieldAccessorTable<global::Sirikata.Subscription.Protocol._PBJ_Internal.Address, global::Sirikata.Subscription.Protocol._PBJ_Internal.Address.Builder>(internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Address__Descriptor,
-                new string[] { "Hostname", "Service", });
-        internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Subscribe__Descriptor = Descriptor.MessageTypes[1];
-        internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Subscribe__FieldAccessorTable = 
-            new pb::FieldAccess.FieldAccessorTable<global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscribe, global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscribe.Builder>(internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Subscribe__Descriptor,
-                new string[] { "BroadcastAddress", "BroadcastName", "UpdatePeriod", });
-        internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Broadcast__Descriptor = Descriptor.MessageTypes[2];
-        internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Broadcast__FieldAccessorTable = 
-            new pb::FieldAccess.FieldAccessorTable<global::Sirikata.Subscription.Protocol._PBJ_Internal.Broadcast, global::Sirikata.Subscription.Protocol._PBJ_Internal.Broadcast.Builder>(internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Broadcast__Descriptor,
-                new string[] { "BroadcastName", });
-        return null;
-      };
-      pbd::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
-          new pbd::FileDescriptor[] {
-          }, assigner);
-    }
-    #endregion
-    
-  }
-  #region Messages
-  public sealed partial class Address : pb::GeneratedMessage<Address, Address.Builder> {
-    private static readonly Address defaultInstance = new Builder().BuildPartial();
-    public static Address DefaultInstance {
-      get { return defaultInstance; }
-    }
-    
-    public override Address DefaultInstanceForType {
-      get { return defaultInstance; }
-    }
-    
-    protected override Address ThisMessage {
-      get { return this; }
-    }
-    
-    public static pbd::MessageDescriptor Descriptor {
-      get { return global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscription.internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Address__Descriptor; }
-    }
-    
-    protected override pb::FieldAccess.FieldAccessorTable<Address, Address.Builder> InternalFieldAccessors {
-      get { return global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscription.internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Address__FieldAccessorTable; }
-    }
-    
-    public const int HostnameFieldNumber = 1;
-    private bool hasHostname;
-    private string hostname_ = "";
-    public bool HasHostname {
-      get { return hasHostname; }
-    }
-    public string Hostname {
-      get { return hostname_; }
-    }
-    
-    public const int ServiceFieldNumber = 2;
-    private bool hasService;
-    private string service_ = "";
-    public bool HasService {
-      get { return hasService; }
-    }
-    public string Service {
-      get { return service_; }
-    }
-    
-    public override bool IsInitialized {
-      get {
-        return true;
-      }
-    }
-    
-    public override void WriteTo(pb::CodedOutputStream output) {
-      if (HasHostname) {
-        output.WriteString(1, Hostname);
-      }
-      if (HasService) {
-        output.WriteString(2, Service);
-      }
-      UnknownFields.WriteTo(output);
-    }
-    
-    private int memoizedSerializedSize = -1;
-    public override int SerializedSize {
-      get {
-        int size = memoizedSerializedSize;
-        if (size != -1) return size;
-        
-        size = 0;
-        if (HasHostname) {
-          size += pb::CodedOutputStream.ComputeStringSize(1, Hostname);
-        }
-        if (HasService) {
-          size += pb::CodedOutputStream.ComputeStringSize(2, Service);
-        }
-        size += UnknownFields.SerializedSize;
-        memoizedSerializedSize = size;
-        return size;
-      }
-    }
-    
-    public static Address ParseFrom(pb::ByteString data) {
-      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static Address ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static Address ParseFrom(byte[] data) {
-      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static Address ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static Address ParseFrom(global::System.IO.Stream input) {
-      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static Address ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    public static Address ParseDelimitedFrom(global::System.IO.Stream input) {
-      return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
-    }
-    public static Address ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
-      return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
-    }
-    public static Address ParseFrom(pb::CodedInputStream input) {
-      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static Address ParseFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    public static Builder CreateBuilder() { return new Builder(); }
-    public override Builder ToBuilder() { return CreateBuilder(this); }
-    public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(Address prototype) {
-      return (Builder) new Builder().MergeFrom(prototype);
-    }
-    
-    public sealed partial class Builder : pb::GeneratedBuilder<Address, Builder> {
-      protected override Builder ThisBuilder {
-        get { return this; }
-      }
-      public Builder() {}
-      
-      Address result = new Address();
-      
-      protected override Address MessageBeingBuilt {
-        get { return result; }
-      }
-      
-      public override Builder Clear() {
-        result = new Address();
-        return this;
-      }
-      
-      public override Builder Clone() {
-        return new Builder().MergeFrom(result);
-      }
-      
-      public override pbd::MessageDescriptor DescriptorForType {
-        get { return global::Sirikata.Subscription.Protocol._PBJ_Internal.Address.Descriptor; }
-      }
-      
-      public override Address DefaultInstanceForType {
-        get { return global::Sirikata.Subscription.Protocol._PBJ_Internal.Address.DefaultInstance; }
-      }
-      
-      public override Address BuildPartial() {
-        if (result == null) {
-          throw new global::System.InvalidOperationException("build() has already been called on this Builder");
-        }
-        Address returnMe = result;
-        result = null;
-        return returnMe;
-      }
-      
-      public override Builder MergeFrom(pb::IMessage other) {
-        if (other is Address) {
-          return MergeFrom((Address) other);
-        } else {
-          base.MergeFrom(other);
-          return this;
-        }
-      }
-      
-      public override Builder MergeFrom(Address other) {
-        if (other == global::Sirikata.Subscription.Protocol._PBJ_Internal.Address.DefaultInstance) return this;
-        if (other.HasHostname) {
-          Hostname = other.Hostname;
-        }
-        if (other.HasService) {
-          Service = other.Service;
-        }
-        this.MergeUnknownFields(other.UnknownFields);
-        return this;
-      }
-      
-      public override Builder MergeFrom(pb::CodedInputStream input) {
-        return MergeFrom(input, pb::ExtensionRegistry.Empty);
-      }
-      
-      public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
-        pb::UnknownFieldSet.Builder unknownFields = null;
-        while (true) {
-          uint tag = input.ReadTag();
-          switch (tag) {
-            case 0: {
-              if (unknownFields != null) {
-                this.UnknownFields = unknownFields.Build();
-              }
-              return this;
-            }
-            default: {
-              if (pb::WireFormat.IsEndGroupTag(tag)) {
-                if (unknownFields != null) {
-                  this.UnknownFields = unknownFields.Build();
-                }
-                return this;
-              }
-              if (unknownFields == null) {
-                unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-              }
-              ParseUnknownField(input, unknownFields, extensionRegistry, tag);
-              break;
-            }
-            case 10: {
-              Hostname = input.ReadString();
-              break;
-            }
-            case 18: {
-              Service = input.ReadString();
-              break;
-            }
-          }
-        }
-      }
-      
-      
-      public bool HasHostname {
-        get { return result.HasHostname; }
-      }
-      public string Hostname {
-        get { return result.Hostname; }
-        set { SetHostname(value); }
-      }
-      public Builder SetHostname(string value) {
-        pb::ThrowHelper.ThrowIfNull(value, "value");
-        result.hasHostname = true;
-        result.hostname_ = value;
-        return this;
-      }
-      public Builder ClearHostname() {
-        result.hasHostname = false;
-        result.hostname_ = "";
-        return this;
-      }
-      
-      public bool HasService {
-        get { return result.HasService; }
-      }
-      public string Service {
-        get { return result.Service; }
-        set { SetService(value); }
-      }
-      public Builder SetService(string value) {
-        pb::ThrowHelper.ThrowIfNull(value, "value");
-        result.hasService = true;
-        result.service_ = value;
-        return this;
-      }
-      public Builder ClearService() {
-        result.hasService = false;
-        result.service_ = "";
-        return this;
-      }
-    }
-    static Address() {
-      object.ReferenceEquals(global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscription.Descriptor, null);
-    }
-  }
-  
-  public sealed partial class Subscribe : pb::GeneratedMessage<Subscribe, Subscribe.Builder> {
-    private static readonly Subscribe defaultInstance = new Builder().BuildPartial();
-    public static Subscribe DefaultInstance {
-      get { return defaultInstance; }
-    }
-    
-    public override Subscribe DefaultInstanceForType {
-      get { return defaultInstance; }
-    }
-    
-    protected override Subscribe ThisMessage {
-      get { return this; }
-    }
-    
-    public static pbd::MessageDescriptor Descriptor {
-      get { return global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscription.internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Subscribe__Descriptor; }
-    }
-    
-    protected override pb::FieldAccess.FieldAccessorTable<Subscribe, Subscribe.Builder> InternalFieldAccessors {
-      get { return global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscription.internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Subscribe__FieldAccessorTable; }
-    }
-    
-    public const int BroadcastAddressFieldNumber = 7;
-    private bool hasBroadcastAddress;
-    private global::Sirikata.Subscription.Protocol._PBJ_Internal.Address broadcastAddress_ = global::Sirikata.Subscription.Protocol._PBJ_Internal.Address.DefaultInstance;
-    public bool HasBroadcastAddress {
-      get { return hasBroadcastAddress; }
-    }
-    public global::Sirikata.Subscription.Protocol._PBJ_Internal.Address BroadcastAddress {
-      get { return broadcastAddress_; }
-    }
-    
-    public const int BroadcastNameFieldNumber = 8;
-    private bool hasBroadcastName;
-    private pb::ByteString broadcastName_ = pb::ByteString.Empty;
-    public bool HasBroadcastName {
-      get { return hasBroadcastName; }
-    }
-    public pb::ByteString BroadcastName {
-      get { return broadcastName_; }
-    }
-    
-    public const int UpdatePeriodFieldNumber = 9;
-    private bool hasUpdatePeriod;
-    private long updatePeriod_ = 0;
-    public bool HasUpdatePeriod {
-      get { return hasUpdatePeriod; }
-    }
-    public long UpdatePeriod {
-      get { return updatePeriod_; }
-    }
-    
-    public override bool IsInitialized {
-      get {
-        return true;
-      }
-    }
-    
-    public override void WriteTo(pb::CodedOutputStream output) {
-      if (HasBroadcastAddress) {
-        output.WriteMessage(7, BroadcastAddress);
-      }
-      if (HasBroadcastName) {
-        output.WriteBytes(8, BroadcastName);
-      }
-      if (HasUpdatePeriod) {
-        output.WriteSFixed64(9, UpdatePeriod);
-      }
-      UnknownFields.WriteTo(output);
-    }
-    
-    private int memoizedSerializedSize = -1;
-    public override int SerializedSize {
-      get {
-        int size = memoizedSerializedSize;
-        if (size != -1) return size;
-        
-        size = 0;
-        if (HasBroadcastAddress) {
-          size += pb::CodedOutputStream.ComputeMessageSize(7, BroadcastAddress);
-        }
-        if (HasBroadcastName) {
-          size += pb::CodedOutputStream.ComputeBytesSize(8, BroadcastName);
-        }
-        if (HasUpdatePeriod) {
-          size += pb::CodedOutputStream.ComputeSFixed64Size(9, UpdatePeriod);
-        }
-        size += UnknownFields.SerializedSize;
-        memoizedSerializedSize = size;
-        return size;
-      }
-    }
-    
-    public static Subscribe ParseFrom(pb::ByteString data) {
-      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static Subscribe ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static Subscribe ParseFrom(byte[] data) {
-      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static Subscribe ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static Subscribe ParseFrom(global::System.IO.Stream input) {
-      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static Subscribe ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    public static Subscribe ParseDelimitedFrom(global::System.IO.Stream input) {
-      return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
-    }
-    public static Subscribe ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
-      return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
-    }
-    public static Subscribe ParseFrom(pb::CodedInputStream input) {
-      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static Subscribe ParseFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    public static Builder CreateBuilder() { return new Builder(); }
-    public override Builder ToBuilder() { return CreateBuilder(this); }
-    public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(Subscribe prototype) {
-      return (Builder) new Builder().MergeFrom(prototype);
-    }
-    
-    public sealed partial class Builder : pb::GeneratedBuilder<Subscribe, Builder> {
-      protected override Builder ThisBuilder {
-        get { return this; }
-      }
-      public Builder() {}
-      
-      Subscribe result = new Subscribe();
-      
-      protected override Subscribe MessageBeingBuilt {
-        get { return result; }
-      }
-      
-      public override Builder Clear() {
-        result = new Subscribe();
-        return this;
-      }
-      
-      public override Builder Clone() {
-        return new Builder().MergeFrom(result);
-      }
-      
-      public override pbd::MessageDescriptor DescriptorForType {
-        get { return global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscribe.Descriptor; }
-      }
-      
-      public override Subscribe DefaultInstanceForType {
-        get { return global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscribe.DefaultInstance; }
-      }
-      
-      public override Subscribe BuildPartial() {
-        if (result == null) {
-          throw new global::System.InvalidOperationException("build() has already been called on this Builder");
-        }
-        Subscribe returnMe = result;
-        result = null;
-        return returnMe;
-      }
-      
-      public override Builder MergeFrom(pb::IMessage other) {
-        if (other is Subscribe) {
-          return MergeFrom((Subscribe) other);
-        } else {
-          base.MergeFrom(other);
-          return this;
-        }
-      }
-      
-      public override Builder MergeFrom(Subscribe other) {
-        if (other == global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscribe.DefaultInstance) return this;
-        if (other.HasBroadcastAddress) {
-          MergeBroadcastAddress(other.BroadcastAddress);
-        }
-        if (other.HasBroadcastName) {
-          BroadcastName = other.BroadcastName;
-        }
-        if (other.HasUpdatePeriod) {
-          UpdatePeriod = other.UpdatePeriod;
-        }
-        this.MergeUnknownFields(other.UnknownFields);
-        return this;
-      }
-      
-      public override Builder MergeFrom(pb::CodedInputStream input) {
-        return MergeFrom(input, pb::ExtensionRegistry.Empty);
-      }
-      
-      public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
-        pb::UnknownFieldSet.Builder unknownFields = null;
-        while (true) {
-          uint tag = input.ReadTag();
-          switch (tag) {
-            case 0: {
-              if (unknownFields != null) {
-                this.UnknownFields = unknownFields.Build();
-              }
-              return this;
-            }
-            default: {
-              if (pb::WireFormat.IsEndGroupTag(tag)) {
-                if (unknownFields != null) {
-                  this.UnknownFields = unknownFields.Build();
-                }
-                return this;
-              }
-              if (unknownFields == null) {
-                unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-              }
-              ParseUnknownField(input, unknownFields, extensionRegistry, tag);
-              break;
-            }
-            case 58: {
-              global::Sirikata.Subscription.Protocol._PBJ_Internal.Address.Builder subBuilder = global::Sirikata.Subscription.Protocol._PBJ_Internal.Address.CreateBuilder();
-              if (HasBroadcastAddress) {
-                subBuilder.MergeFrom(BroadcastAddress);
-              }
-              input.ReadMessage(subBuilder, extensionRegistry);
-              BroadcastAddress = subBuilder.BuildPartial();
-              break;
-            }
-            case 66: {
-              BroadcastName = input.ReadBytes();
-              break;
-            }
-            case 73: {
-              UpdatePeriod = input.ReadSFixed64();
-              break;
-            }
-          }
-        }
-      }
-      
-      
-      public bool HasBroadcastAddress {
-       get { return result.HasBroadcastAddress; }
-      }
-      public global::Sirikata.Subscription.Protocol._PBJ_Internal.Address BroadcastAddress {
-        get { return result.BroadcastAddress; }
-        set { SetBroadcastAddress(value); }
-      }
-      public Builder SetBroadcastAddress(global::Sirikata.Subscription.Protocol._PBJ_Internal.Address value) {
-        pb::ThrowHelper.ThrowIfNull(value, "value");
-        result.hasBroadcastAddress = true;
-        result.broadcastAddress_ = value;
-        return this;
-      }
-      public Builder SetBroadcastAddress(global::Sirikata.Subscription.Protocol._PBJ_Internal.Address.Builder builderForValue) {
-        pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue");
-        result.hasBroadcastAddress = true;
-        result.broadcastAddress_ = builderForValue.Build();
-        return this;
-      }
-      public Builder MergeBroadcastAddress(global::Sirikata.Subscription.Protocol._PBJ_Internal.Address value) {
-        pb::ThrowHelper.ThrowIfNull(value, "value");
-        if (result.HasBroadcastAddress &&
-            result.broadcastAddress_ != global::Sirikata.Subscription.Protocol._PBJ_Internal.Address.DefaultInstance) {
-            result.broadcastAddress_ = global::Sirikata.Subscription.Protocol._PBJ_Internal.Address.CreateBuilder(result.broadcastAddress_).MergeFrom(value).BuildPartial();
-        } else {
-          result.broadcastAddress_ = value;
-        }
-        result.hasBroadcastAddress = true;
-        return this;
-      }
-      public Builder ClearBroadcastAddress() {
-        result.hasBroadcastAddress = false;
-        result.broadcastAddress_ = global::Sirikata.Subscription.Protocol._PBJ_Internal.Address.DefaultInstance;
-        return this;
-      }
-      
-      public bool HasBroadcastName {
-        get { return result.HasBroadcastName; }
-      }
-      public pb::ByteString BroadcastName {
-        get { return result.BroadcastName; }
-        set { SetBroadcastName(value); }
-      }
-      public Builder SetBroadcastName(pb::ByteString value) {
-        pb::ThrowHelper.ThrowIfNull(value, "value");
-        result.hasBroadcastName = true;
-        result.broadcastName_ = value;
-        return this;
-      }
-      public Builder ClearBroadcastName() {
-        result.hasBroadcastName = false;
-        result.broadcastName_ = pb::ByteString.Empty;
-        return this;
-      }
-      
-      public bool HasUpdatePeriod {
-        get { return result.HasUpdatePeriod; }
-      }
-      public long UpdatePeriod {
-        get { return result.UpdatePeriod; }
-        set { SetUpdatePeriod(value); }
-      }
-      public Builder SetUpdatePeriod(long value) {
-        result.hasUpdatePeriod = true;
-        result.updatePeriod_ = value;
-        return this;
-      }
-      public Builder ClearUpdatePeriod() {
-        result.hasUpdatePeriod = false;
-        result.updatePeriod_ = 0;
-        return this;
-      }
-    }
-    static Subscribe() {
-      object.ReferenceEquals(global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscription.Descriptor, null);
-    }
-  }
-  
-  public sealed partial class Broadcast : pb::GeneratedMessage<Broadcast, Broadcast.Builder> {
-    private static readonly Broadcast defaultInstance = new Builder().BuildPartial();
-    public static Broadcast DefaultInstance {
-      get { return defaultInstance; }
-    }
-    
-    public override Broadcast DefaultInstanceForType {
-      get { return defaultInstance; }
-    }
-    
-    protected override Broadcast ThisMessage {
-      get { return this; }
-    }
-    
-    public static pbd::MessageDescriptor Descriptor {
-      get { return global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscription.internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Broadcast__Descriptor; }
-    }
-    
-    protected override pb::FieldAccess.FieldAccessorTable<Broadcast, Broadcast.Builder> InternalFieldAccessors {
-      get { return global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscription.internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Broadcast__FieldAccessorTable; }
-    }
-    
-    public const int BroadcastNameFieldNumber = 7;
-    private bool hasBroadcastName;
-    private pb::ByteString broadcastName_ = pb::ByteString.Empty;
-    public bool HasBroadcastName {
-      get { return hasBroadcastName; }
-    }
-    public pb::ByteString BroadcastName {
-      get { return broadcastName_; }
-    }
-    
-    public override bool IsInitialized {
-      get {
-        return true;
-      }
-    }
-    
-    public override void WriteTo(pb::CodedOutputStream output) {
-      if (HasBroadcastName) {
-        output.WriteBytes(7, BroadcastName);
-      }
-      UnknownFields.WriteTo(output);
-    }
-    
-    private int memoizedSerializedSize = -1;
-    public override int SerializedSize {
-      get {
-        int size = memoizedSerializedSize;
-        if (size != -1) return size;
-        
-        size = 0;
-        if (HasBroadcastName) {
-          size += pb::CodedOutputStream.ComputeBytesSize(7, BroadcastName);
-        }
-        size += UnknownFields.SerializedSize;
-        memoizedSerializedSize = size;
-        return size;
-      }
-    }
-    
-    public static Broadcast ParseFrom(pb::ByteString data) {
-      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static Broadcast ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static Broadcast ParseFrom(byte[] data) {
-      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static Broadcast ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static Broadcast ParseFrom(global::System.IO.Stream input) {
-      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static Broadcast ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    public static Broadcast ParseDelimitedFrom(global::System.IO.Stream input) {
-      return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
-    }
-    public static Broadcast ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
-      return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
-    }
-    public static Broadcast ParseFrom(pb::CodedInputStream input) {
-      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static Broadcast ParseFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    public static Builder CreateBuilder() { return new Builder(); }
-    public override Builder ToBuilder() { return CreateBuilder(this); }
-    public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(Broadcast prototype) {
-      return (Builder) new Builder().MergeFrom(prototype);
-    }
-    
-    public sealed partial class Builder : pb::GeneratedBuilder<Broadcast, Builder> {
-      protected override Builder ThisBuilder {
-        get { return this; }
-      }
-      public Builder() {}
-      
-      Broadcast result = new Broadcast();
-      
-      protected override Broadcast MessageBeingBuilt {
-        get { return result; }
-      }
-      
-      public override Builder Clear() {
-        result = new Broadcast();
-        return this;
-      }
-      
-      public override Builder Clone() {
-        return new Builder().MergeFrom(result);
-      }
-      
-      public override pbd::MessageDescriptor DescriptorForType {
-        get { return global::Sirikata.Subscription.Protocol._PBJ_Internal.Broadcast.Descriptor; }
-      }
-      
-      public override Broadcast DefaultInstanceForType {
-        get { return global::Sirikata.Subscription.Protocol._PBJ_Internal.Broadcast.DefaultInstance; }
-      }
-      
-      public override Broadcast BuildPartial() {
-        if (result == null) {
-          throw new global::System.InvalidOperationException("build() has already been called on this Builder");
-        }
-        Broadcast returnMe = result;
-        result = null;
-        return returnMe;
-      }
-      
-      public override Builder MergeFrom(pb::IMessage other) {
-        if (other is Broadcast) {
-          return MergeFrom((Broadcast) other);
-        } else {
-          base.MergeFrom(other);
-          return this;
-        }
-      }
-      
-      public override Builder MergeFrom(Broadcast other) {
-        if (other == global::Sirikata.Subscription.Protocol._PBJ_Internal.Broadcast.DefaultInstance) return this;
-        if (other.HasBroadcastName) {
-          BroadcastName = other.BroadcastName;
-        }
-        this.MergeUnknownFields(other.UnknownFields);
-        return this;
-      }
-      
-      public override Builder MergeFrom(pb::CodedInputStream input) {
-        return MergeFrom(input, pb::ExtensionRegistry.Empty);
-      }
-      
-      public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
-        pb::UnknownFieldSet.Builder unknownFields = null;
-        while (true) {
-          uint tag = input.ReadTag();
-          switch (tag) {
-            case 0: {
-              if (unknownFields != null) {
-                this.UnknownFields = unknownFields.Build();
-              }
-              return this;
-            }
-            default: {
-              if (pb::WireFormat.IsEndGroupTag(tag)) {
-                if (unknownFields != null) {
-                  this.UnknownFields = unknownFields.Build();
-                }
-                return this;
-              }
-              if (unknownFields == null) {
-                unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-              }
-              ParseUnknownField(input, unknownFields, extensionRegistry, tag);
-              break;
-            }
-            case 58: {
-              BroadcastName = input.ReadBytes();
-              break;
-            }
-          }
-        }
-      }
-      
-      
-      public bool HasBroadcastName {
-        get { return result.HasBroadcastName; }
-      }
-      public pb::ByteString BroadcastName {
-        get { return result.BroadcastName; }
-        set { SetBroadcastName(value); }
-      }
-      public Builder SetBroadcastName(pb::ByteString value) {
-        pb::ThrowHelper.ThrowIfNull(value, "value");
-        result.hasBroadcastName = true;
-        result.broadcastName_ = value;
-        return this;
-      }
-      public Builder ClearBroadcastName() {
-        result.hasBroadcastName = false;
-        result.broadcastName_ = pb::ByteString.Empty;
-        return this;
-      }
-    }
-    static Broadcast() {
-      object.ReferenceEquals(global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscription.Descriptor, null);
-    }
-  }
-  
-  #endregion
-  
-}
--- a/OpenSim/Client/Sirikata/Protocol/Subscription.pbj.cs
+++ b/OpenSim/Client/Sirikata/Protocol/Subscription.pbj.cs
@@ -1,431 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using pbd = global::Google.ProtocolBuffers.Descriptors;
-using pb = global::Google.ProtocolBuffers;
-namespace Sirikata.Subscription.Protocol {
-    public class Address : PBJ.IMessage {
-        protected _PBJ_Internal.Address super;
-        public _PBJ_Internal.Address _PBJSuper{ get { return super;} }
-        public Address() {
-            super=new _PBJ_Internal.Address();
-        }
-        public Address(_PBJ_Internal.Address reference) {
-            super=reference;
-        }
-        public static Address defaultInstance= new Address (_PBJ_Internal.Address.DefaultInstance);
-        public static Address DefaultInstance{
-            get {return defaultInstance;}
-        }
-        public static pbd.MessageDescriptor Descriptor {
-            get { return _PBJ_Internal.Address.Descriptor; }        }
-        public static class Types {
-        }
-        public static bool WithinReservedFieldTagRange(int field_tag) {
-            return false;
-        }
-        public static bool WithinExtensionFieldTagRange(int field_tag) {
-            return false;
-        }
-        public const int HostnameFieldTag=1;
-        public bool HasHostname{ get {return super.HasHostname&&PBJ._PBJ.ValidateString(super.Hostname);} }
-        public string Hostname{ get {
-            if (HasHostname) {
-                return PBJ._PBJ.CastString(super.Hostname);
-            } else {
-                return PBJ._PBJ.CastString();
-            }
-        }
-        }
-        public const int ServiceFieldTag=2;
-        public bool HasService{ get {return super.HasService&&PBJ._PBJ.ValidateString(super.Service);} }
-        public string Service{ get {
-            if (HasService) {
-                return PBJ._PBJ.CastString(super.Service);
-            } else {
-                return PBJ._PBJ.CastString();
-            }
-        }
-        }
-            public override Google.ProtocolBuffers.IMessage _PBJISuper { get { return super; } }
-        public override PBJ.IMessage.IBuilder WeakCreateBuilderForType() { return new Builder(); }
-        public static Builder CreateBuilder() { return new Builder(); }
-        public static Builder CreateBuilder(Address prototype) {
-            return (Builder)new Builder().MergeFrom(prototype);
-        }
-        public static Address ParseFrom(pb::ByteString data) {
-            return new Address(_PBJ_Internal.Address.ParseFrom(data));
-        }
-        public static Address ParseFrom(pb::ByteString data, pb::ExtensionRegistry er) {
-            return new Address(_PBJ_Internal.Address.ParseFrom(data,er));
-        }
-        public static Address ParseFrom(byte[] data) {
-            return new Address(_PBJ_Internal.Address.ParseFrom(data));
-        }
-        public static Address ParseFrom(byte[] data, pb::ExtensionRegistry er) {
-            return new Address(_PBJ_Internal.Address.ParseFrom(data,er));
-        }
-        public static Address ParseFrom(global::System.IO.Stream data) {
-            return new Address(_PBJ_Internal.Address.ParseFrom(data));
-        }
-        public static Address ParseFrom(global::System.IO.Stream data, pb::ExtensionRegistry er) {
-            return new Address(_PBJ_Internal.Address.ParseFrom(data,er));
-        }
-        public static Address ParseFrom(pb::CodedInputStream data) {
-            return new Address(_PBJ_Internal.Address.ParseFrom(data));
-        }
-        public static Address ParseFrom(pb::CodedInputStream data, pb::ExtensionRegistry er) {
-            return new Address(_PBJ_Internal.Address.ParseFrom(data,er));
-        }
-        protected override bool _HasAllPBJFields{ get {
-            return true
-                ;
-        } }
-        public bool IsInitialized { get {
-            return super.IsInitialized&&_HasAllPBJFields;
-        } }
-        public class Builder : global::PBJ.IMessage.IBuilder{
-        protected override bool _HasAllPBJFields{ get {
-            return true
-                ;
-        } }
-        public bool IsInitialized { get {
-            return super.IsInitialized&&_HasAllPBJFields;
-        } }
-            protected _PBJ_Internal.Address.Builder super;
-            public override Google.ProtocolBuffers.IBuilder _PBJISuper { get { return super; } }
-            public _PBJ_Internal.Address.Builder _PBJSuper{ get { return super;} }
-            public Builder() {super = new _PBJ_Internal.Address.Builder();}
-            public Builder(_PBJ_Internal.Address.Builder other) {
-                super=other;
-            }
-            public Builder Clone() {return new Builder(super.Clone());}
-            public Builder MergeFrom(Address prototype) { super.MergeFrom(prototype._PBJSuper);return this;}
-            public Builder Clear() {super.Clear();return this;}
-            public Address BuildPartial() {return new Address(super.BuildPartial());}
-            public Address Build() {if (_HasAllPBJFields) return new Address(super.Build());return null;}
-            public pbd::MessageDescriptor DescriptorForType {
-                get { return Address.Descriptor; }            }
-        public Builder ClearHostname() { super.ClearHostname();return this;}
-        public const int HostnameFieldTag=1;
-        public bool HasHostname{ get {return super.HasHostname&&PBJ._PBJ.ValidateString(super.Hostname);} }
-        public string Hostname{ get {
-            if (HasHostname) {
-                return PBJ._PBJ.CastString(super.Hostname);
-            } else {
-                return PBJ._PBJ.CastString();
-            }
-        }
-        set {
-            super.Hostname=(PBJ._PBJ.Construct(value));
-        }
-        }
-        public Builder ClearService() { super.ClearService();return this;}
-        public const int ServiceFieldTag=2;
-        public bool HasService{ get {return super.HasService&&PBJ._PBJ.ValidateString(super.Service);} }
-        public string Service{ get {
-            if (HasService) {
-                return PBJ._PBJ.CastString(super.Service);
-            } else {
-                return PBJ._PBJ.CastString();
-            }
-        }
-        set {
-            super.Service=(PBJ._PBJ.Construct(value));
-        }
-        }
-        }
-    }
-}
-namespace Sirikata.Subscription.Protocol {
-    public class Subscribe : PBJ.IMessage {
-        protected _PBJ_Internal.Subscribe super;
-        public _PBJ_Internal.Subscribe _PBJSuper{ get { return super;} }
-        public Subscribe() {
-            super=new _PBJ_Internal.Subscribe();
-        }
-        public Subscribe(_PBJ_Internal.Subscribe reference) {
-            super=reference;
-        }
-        public static Subscribe defaultInstance= new Subscribe (_PBJ_Internal.Subscribe.DefaultInstance);
-        public static Subscribe DefaultInstance{
-            get {return defaultInstance;}
-        }
-        public static pbd.MessageDescriptor Descriptor {
-            get { return _PBJ_Internal.Subscribe.Descriptor; }        }
-        public static class Types {
-        }
-        public static bool WithinReservedFieldTagRange(int field_tag) {
-            return false||(field_tag>=1&&field_tag<=6)||(field_tag>=1536&&field_tag<=2560)||(field_tag>=229376&&field_tag<=294912);
-        }
-        public static bool WithinExtensionFieldTagRange(int field_tag) {
-            return false;
-        }
-        public const int BroadcastAddressFieldTag=7;
-        public bool HasBroadcastAddress{ get {return super.HasBroadcastAddress;} }
-        public Address BroadcastAddress{ get {
-            if (HasBroadcastAddress) {
-                return new Address(super.BroadcastAddress);
-            } else {
-                return new Address();
-            }
-        }
-        }
-        public const int BroadcastNameFieldTag=8;
-        public bool HasBroadcastName{ get {return super.HasBroadcastName&&PBJ._PBJ.ValidateUuid(super.BroadcastName);} }
-        public PBJ.UUID BroadcastName{ get {
-            if (HasBroadcastName) {
-                return PBJ._PBJ.CastUuid(super.BroadcastName);
-            } else {
-                return PBJ._PBJ.CastUuid();
-            }
-        }
-        }
-        public const int UpdatePeriodFieldTag=9;
-        public bool HasUpdatePeriod{ get {return super.HasUpdatePeriod&&PBJ._PBJ.ValidateDuration(super.UpdatePeriod);} }
-        public PBJ.Duration UpdatePeriod{ get {
-            if (HasUpdatePeriod) {
-                return PBJ._PBJ.CastDuration(super.UpdatePeriod);
-            } else {
-                return PBJ._PBJ.CastDuration();
-            }
-        }
-        }
-            public override Google.ProtocolBuffers.IMessage _PBJISuper { get { return super; } }
-        public override PBJ.IMessage.IBuilder WeakCreateBuilderForType() { return new Builder(); }
-        public static Builder CreateBuilder() { return new Builder(); }
-        public static Builder CreateBuilder(Subscribe prototype) {
-            return (Builder)new Builder().MergeFrom(prototype);
-        }
-        public static Subscribe ParseFrom(pb::ByteString data) {
-            return new Subscribe(_PBJ_Internal.Subscribe.ParseFrom(data));
-        }
-        public static Subscribe ParseFrom(pb::ByteString data, pb::ExtensionRegistry er) {
-            return new Subscribe(_PBJ_Internal.Subscribe.ParseFrom(data,er));
-        }
-        public static Subscribe ParseFrom(byte[] data) {
-            return new Subscribe(_PBJ_Internal.Subscribe.ParseFrom(data));
-        }
-        public static Subscribe ParseFrom(byte[] data, pb::ExtensionRegistry er) {
-            return new Subscribe(_PBJ_Internal.Subscribe.ParseFrom(data,er));
-        }
-        public static Subscribe ParseFrom(global::System.IO.Stream data) {
-            return new Subscribe(_PBJ_Internal.Subscribe.ParseFrom(data));
-        }
-        public static Subscribe ParseFrom(global::System.IO.Stream data, pb::ExtensionRegistry er) {
-            return new Subscribe(_PBJ_Internal.Subscribe.ParseFrom(data,er));
-        }
-        public static Subscribe ParseFrom(pb::CodedInputStream data) {
-            return new Subscribe(_PBJ_Internal.Subscribe.ParseFrom(data));
-        }
-        public static Subscribe ParseFrom(pb::CodedInputStream data, pb::ExtensionRegistry er) {
-            return new Subscribe(_PBJ_Internal.Subscribe.ParseFrom(data,er));
-        }
-        protected override bool _HasAllPBJFields{ get {
-            return true
-                ;
-        } }
-        public bool IsInitialized { get {
-            return super.IsInitialized&&_HasAllPBJFields;
-        } }
-        public class Builder : global::PBJ.IMessage.IBuilder{
-        protected override bool _HasAllPBJFields{ get {
-            return true
-                ;
-        } }
-        public bool IsInitialized { get {
-            return super.IsInitialized&&_HasAllPBJFields;
-        } }
-            protected _PBJ_Internal.Subscribe.Builder super;
-            public override Google.ProtocolBuffers.IBuilder _PBJISuper { get { return super; } }
-            public _PBJ_Internal.Subscribe.Builder _PBJSuper{ get { return super;} }
-            public Builder() {super = new _PBJ_Internal.Subscribe.Builder();}
-            public Builder(_PBJ_Internal.Subscribe.Builder other) {
-                super=other;
-            }
-            public Builder Clone() {return new Builder(super.Clone());}
-            public Builder MergeFrom(Subscribe prototype) { super.MergeFrom(prototype._PBJSuper);return this;}
-            public Builder Clear() {super.Clear();return this;}
-            public Subscribe BuildPartial() {return new Subscribe(super.BuildPartial());}
-            public Subscribe Build() {if (_HasAllPBJFields) return new Subscribe(super.Build());return null;}
-            public pbd::MessageDescriptor DescriptorForType {
-                get { return Subscribe.Descriptor; }            }
-        public Builder ClearBroadcastAddress() { super.ClearBroadcastAddress();return this;}
-        public const int BroadcastAddressFieldTag=7;
-        public bool HasBroadcastAddress{ get {return super.HasBroadcastAddress;} }
-        public Address BroadcastAddress{ get {
-            if (HasBroadcastAddress) {
-                return new Address(super.BroadcastAddress);
-            } else {
-                return new Address();
-            }
-        }
-        set {
-            super.BroadcastAddress=value._PBJSuper;
-        }
-        }
-        public Builder ClearBroadcastName() { super.ClearBroadcastName();return this;}
-        public const int BroadcastNameFieldTag=8;
-        public bool HasBroadcastName{ get {return super.HasBroadcastName&&PBJ._PBJ.ValidateUuid(super.BroadcastName);} }
-        public PBJ.UUID BroadcastName{ get {
-            if (HasBroadcastName) {
-                return PBJ._PBJ.CastUuid(super.BroadcastName);
-            } else {
-                return PBJ._PBJ.CastUuid();
-            }
-        }
-        set {
-            super.BroadcastName=(PBJ._PBJ.Construct(value));
-        }
-        }
-        public Builder ClearUpdatePeriod() { super.ClearUpdatePeriod();return this;}
-        public const int UpdatePeriodFieldTag=9;
-        public bool HasUpdatePeriod{ get {return super.HasUpdatePeriod&&PBJ._PBJ.ValidateDuration(super.UpdatePeriod);} }
-        public PBJ.Duration UpdatePeriod{ get {
-            if (HasUpdatePeriod) {
-                return PBJ._PBJ.CastDuration(super.UpdatePeriod);
-            } else {
-                return PBJ._PBJ.CastDuration();
-            }
-        }
-        set {
-            super.UpdatePeriod=(PBJ._PBJ.Construct(value));
-        }
-        }
-        }
-    }
-}
-namespace Sirikata.Subscription.Protocol {
-    public class Broadcast : PBJ.IMessage {
-        protected _PBJ_Internal.Broadcast super;
-        public _PBJ_Internal.Broadcast _PBJSuper{ get { return super;} }
-        public Broadcast() {
-            super=new _PBJ_Internal.Broadcast();
-        }
-        public Broadcast(_PBJ_Internal.Broadcast reference) {
-            super=reference;
-        }
-        public static Broadcast defaultInstance= new Broadcast (_PBJ_Internal.Broadcast.DefaultInstance);
-        public static Broadcast DefaultInstance{
-            get {return defaultInstance;}
-        }
-        public static pbd.MessageDescriptor Descriptor {
-            get { return _PBJ_Internal.Broadcast.Descriptor; }        }
-        public static class Types {
-        }
-        public static bool WithinReservedFieldTagRange(int field_tag) {
-            return false||(field_tag>=1&&field_tag<=6)||(field_tag>=1536&&field_tag<=2560)||(field_tag>=229376&&field_tag<=294912);
-        }
-        public static bool WithinExtensionFieldTagRange(int field_tag) {
-            return false;
-        }
-        public const int BroadcastNameFieldTag=7;
-        public bool HasBroadcastName{ get {return super.HasBroadcastName&&PBJ._PBJ.ValidateUuid(super.BroadcastName);} }
-        public PBJ.UUID BroadcastName{ get {
-            if (HasBroadcastName) {
-                return PBJ._PBJ.CastUuid(super.BroadcastName);
-            } else {
-                return PBJ._PBJ.CastUuid();
-            }
-        }
-        }
-            public override Google.ProtocolBuffers.IMessage _PBJISuper { get { return super; } }
-        public override PBJ.IMessage.IBuilder WeakCreateBuilderForType() { return new Builder(); }
-        public static Builder CreateBuilder() { return new Builder(); }
-        public static Builder CreateBuilder(Broadcast prototype) {
-            return (Builder)new Builder().MergeFrom(prototype);
-        }
-        public static Broadcast ParseFrom(pb::ByteString data) {
-            return new Broadcast(_PBJ_Internal.Broadcast.ParseFrom(data));
-        }
-        public static Broadcast ParseFrom(pb::ByteString data, pb::ExtensionRegistry er) {
-            return new Broadcast(_PBJ_Internal.Broadcast.ParseFrom(data,er));
-        }
-        public static Broadcast ParseFrom(byte[] data) {
-            return new Broadcast(_PBJ_Internal.Broadcast.ParseFrom(data));
-        }
-        public static Broadcast ParseFrom(byte[] data, pb::ExtensionRegistry er) {
-            return new Broadcast(_PBJ_Internal.Broadcast.ParseFrom(data,er));
-        }
-        public static Broadcast ParseFrom(global::System.IO.Stream data) {
-            return new Broadcast(_PBJ_Internal.Broadcast.ParseFrom(data));
-        }
-        public static Broadcast ParseFrom(global::System.IO.Stream data, pb::ExtensionRegistry er) {
-            return new Broadcast(_PBJ_Internal.Broadcast.ParseFrom(data,er));
-        }
-        public static Broadcast ParseFrom(pb::CodedInputStream data) {
-            return new Broadcast(_PBJ_Internal.Broadcast.ParseFrom(data));
-        }
-        public static Broadcast ParseFrom(pb::CodedInputStream data, pb::ExtensionRegistry er) {
-            return new Broadcast(_PBJ_Internal.Broadcast.ParseFrom(data,er));
-        }
-        protected override bool _HasAllPBJFields{ get {
-            return true
-                ;
-        } }
-        public bool IsInitialized { get {
-            return super.IsInitialized&&_HasAllPBJFields;
-        } }
-        public class Builder : global::PBJ.IMessage.IBuilder{
-        protected override bool _HasAllPBJFields{ get {
-            return true
-                ;
-        } }
-        public bool IsInitialized { get {
-            return super.IsInitialized&&_HasAllPBJFields;
-        } }
-            protected _PBJ_Internal.Broadcast.Builder super;
-            public override Google.ProtocolBuffers.IBuilder _PBJISuper { get { return super; } }
-            public _PBJ_Internal.Broadcast.Builder _PBJSuper{ get { return super;} }
-            public Builder() {super = new _PBJ_Internal.Broadcast.Builder();}
-            public Builder(_PBJ_Internal.Broadcast.Builder other) {
-                super=other;
-            }
-            public Builder Clone() {return new Builder(super.Clone());}
-            public Builder MergeFrom(Broadcast prototype) { super.MergeFrom(prototype._PBJSuper);return this;}
-            public Builder Clear() {super.Clear();return this;}
-            public Broadcast BuildPartial() {return new Broadcast(super.BuildPartial());}
-            public Broadcast Build() {if (_HasAllPBJFields) return new Broadcast(super.Build());return null;}
-            public pbd::MessageDescriptor DescriptorForType {
-                get { return Broadcast.Descriptor; }            }
-        public Builder ClearBroadcastName() { super.ClearBroadcastName();return this;}
-        public const int BroadcastNameFieldTag=7;
-        public bool HasBroadcastName{ get {return super.HasBroadcastName&&PBJ._PBJ.ValidateUuid(super.BroadcastName);} }
-        public PBJ.UUID BroadcastName{ get {
-            if (HasBroadcastName) {
-                return PBJ._PBJ.CastUuid(super.BroadcastName);
-            } else {
-                return PBJ._PBJ.CastUuid();
-            }
-        }
-        set {
-            super.BroadcastName=(PBJ._PBJ.Construct(value));
-        }
-        }
-        }
-    }
-}
--- a/OpenSim/Client/Sirikata/Protocol/Test.cs
+++ b/OpenSim/Client/Sirikata/Protocol/Test.cs
--- a/OpenSim/Client/Sirikata/Protocol/Test.pbj.cs
+++ b/OpenSim/Client/Sirikata/Protocol/Test.pbj.cs
--- a/OpenSim/Client/Sirikata/Protocol/Time.cs
+++ b/OpenSim/Client/Sirikata/Protocol/Time.cs
@@ -1,454 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-using pb = global::Google.ProtocolBuffers;
-using pbc = global::Google.ProtocolBuffers.Collections;
-using pbd = global::Google.ProtocolBuffers.Descriptors;
-using scg = global::System.Collections.Generic;
-namespace Sirikata.Network.Protocol._PBJ_Internal {
-  
-  public static partial class Time {
-  
-    #region Extension registration
-    public static void RegisterAllExtensions(pb::ExtensionRegistry registry) {
-    }
-    #endregion
-    #region Static variables
-    internal static pbd::MessageDescriptor internal__static_Sirikata_Network_Protocol__PBJ_Internal_TimeSync__Descriptor;
-    internal static pb::FieldAccess.FieldAccessorTable<global::Sirikata.Network.Protocol._PBJ_Internal.TimeSync, global::Sirikata.Network.Protocol._PBJ_Internal.TimeSync.Builder> internal__static_Sirikata_Network_Protocol__PBJ_Internal_TimeSync__FieldAccessorTable;
-    #endregion
-    #region Descriptor
-    public static pbd::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbd::FileDescriptor descriptor;
-    
-    static Time() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          "CgpUaW1lLnByb3RvEidTaXJpa2F0YS5OZXR3b3JrLlByb3RvY29sLl9QQkpf" + 
-          "SW50ZXJuYWwirQEKCFRpbWVTeW5jEhMKC2NsaWVudF90aW1lGAkgASgGEhMK" + 
-          "C3NlcnZlcl90aW1lGAogASgGEhIKCnN5bmNfcm91bmQYCyABKAQSFgoOcmV0" + 
-          "dXJuX29wdGlvbnMYDiABKA0SEwoKcm91bmRfdHJpcBiBFCABKAYiNgoNUmV0" + 
-          "dXJuT3B0aW9ucxISCg5SRVBMWV9SRUxJQUJMRRABEhEKDVJFUExZX09SREVS" + 
-          "RUQQAg==");
-      pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) {
-        descriptor = root;
-        internal__static_Sirikata_Network_Protocol__PBJ_Internal_TimeSync__Descriptor = Descriptor.MessageTypes[0];
-        internal__static_Sirikata_Network_Protocol__PBJ_Internal_TimeSync__FieldAccessorTable = 
-            new pb::FieldAccess.FieldAccessorTable<global::Sirikata.Network.Protocol._PBJ_Internal.TimeSync, global::Sirikata.Network.Protocol._PBJ_Internal.TimeSync.Builder>(internal__static_Sirikata_Network_Protocol__PBJ_Internal_TimeSync__Descriptor,
-                new string[] { "ClientTime", "ServerTime", "SyncRound", "ReturnOptions", "RoundTrip", });
-        return null;
-      };
-      pbd::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
-          new pbd::FileDescriptor[] {
-          }, assigner);
-    }
-    #endregion
-    
-  }
-  #region Messages
-  public sealed partial class TimeSync : pb::GeneratedMessage<TimeSync, TimeSync.Builder> {
-    private static readonly TimeSync defaultInstance = new Builder().BuildPartial();
-    public static TimeSync DefaultInstance {
-      get { return defaultInstance; }
-    }
-    
-    public override TimeSync DefaultInstanceForType {
-      get { return defaultInstance; }
-    }
-    
-    protected override TimeSync ThisMessage {
-      get { return this; }
-    }
-    
-    public static pbd::MessageDescriptor Descriptor {
-      get { return global::Sirikata.Network.Protocol._PBJ_Internal.Time.internal__static_Sirikata_Network_Protocol__PBJ_Internal_TimeSync__Descriptor; }
-    }
-    
-    protected override pb::FieldAccess.FieldAccessorTable<TimeSync, TimeSync.Builder> InternalFieldAccessors {
-      get { return global::Sirikata.Network.Protocol._PBJ_Internal.Time.internal__static_Sirikata_Network_Protocol__PBJ_Internal_TimeSync__FieldAccessorTable; }
-    }
-    
-    #region Nested types
-    public static class Types {
-      public enum ReturnOptions {
-        REPLY_RELIABLE = 1,
-        REPLY_ORDERED = 2,
-      }
-      
-    }
-    #endregion
-    
-    public const int ClientTimeFieldNumber = 9;
-    private bool hasClientTime;
-    private ulong clientTime_ = 0;
-    public bool HasClientTime {
-      get { return hasClientTime; }
-    }
-    [global::System.CLSCompliant(false)]
-    public ulong ClientTime {
-      get { return clientTime_; }
-    }
-    
-    public const int ServerTimeFieldNumber = 10;
-    private bool hasServerTime;
-    private ulong serverTime_ = 0;
-    public bool HasServerTime {
-      get { return hasServerTime; }
-    }
-    [global::System.CLSCompliant(false)]
-    public ulong ServerTime {
-      get { return serverTime_; }
-    }
-    
-    public const int SyncRoundFieldNumber = 11;
-    private bool hasSyncRound;
-    private ulong syncRound_ = 0UL;
-    public bool HasSyncRound {
-      get { return hasSyncRound; }
-    }
-    [global::System.CLSCompliant(false)]
-    public ulong SyncRound {
-      get { return syncRound_; }
-    }
-    
-    public const int ReturnOptionsFieldNumber = 14;
-    private bool hasReturnOptions;
-    private uint returnOptions_ = 0;
-    public bool HasReturnOptions {
-      get { return hasReturnOptions; }
-    }
-    [global::System.CLSCompliant(false)]
-    public uint ReturnOptions {
-      get { return returnOptions_; }
-    }
-    
-    public const int RoundTripFieldNumber = 2561;
-    private bool hasRoundTrip;
-    private ulong roundTrip_ = 0;
-    public bool HasRoundTrip {
-      get { return hasRoundTrip; }
-    }
-    [global::System.CLSCompliant(false)]
-    public ulong RoundTrip {
-      get { return roundTrip_; }
-    }
-    
-    public override bool IsInitialized {
-      get {
-        return true;
-      }
-    }
-    
-    public override void WriteTo(pb::CodedOutputStream output) {
-      if (HasClientTime) {
-        output.WriteFixed64(9, ClientTime);
-      }
-      if (HasServerTime) {
-        output.WriteFixed64(10, ServerTime);
-      }
-      if (HasSyncRound) {
-        output.WriteUInt64(11, SyncRound);
-      }
-      if (HasReturnOptions) {
-        output.WriteUInt32(14, ReturnOptions);
-      }
-      if (HasRoundTrip) {
-        output.WriteFixed64(2561, RoundTrip);
-      }
-      UnknownFields.WriteTo(output);
-    }
-    
-    private int memoizedSerializedSize = -1;
-    public override int SerializedSize {
-      get {
-        int size = memoizedSerializedSize;
-        if (size != -1) return size;
-        
-        size = 0;
-        if (HasClientTime) {
-          size += pb::CodedOutputStream.ComputeFixed64Size(9, ClientTime);
-        }
-        if (HasServerTime) {
-          size += pb::CodedOutputStream.ComputeFixed64Size(10, ServerTime);
-        }
-        if (HasSyncRound) {
-          size += pb::CodedOutputStream.ComputeUInt64Size(11, SyncRound);
-        }
-        if (HasReturnOptions) {
-          size += pb::CodedOutputStream.ComputeUInt32Size(14, ReturnOptions);
-        }
-        if (HasRoundTrip) {
-          size += pb::CodedOutputStream.ComputeFixed64Size(2561, RoundTrip);
-        }
-        size += UnknownFields.SerializedSize;
-        memoizedSerializedSize = size;
-        return size;
-      }
-    }
-    
-    public static TimeSync ParseFrom(pb::ByteString data) {
-      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static TimeSync ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static TimeSync ParseFrom(byte[] data) {
-      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
-    }
-    public static TimeSync ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
-    }
-    public static TimeSync ParseFrom(global::System.IO.Stream input) {
-      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static TimeSync ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    public static TimeSync ParseDelimitedFrom(global::System.IO.Stream input) {
-      return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
-    }
-    public static TimeSync ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
-      return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
-    }
-    public static TimeSync ParseFrom(pb::CodedInputStream input) {
-      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
-    }
-    public static TimeSync ParseFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
-      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
-    }
-    public static Builder CreateBuilder() { return new Builder(); }
-    public override Builder ToBuilder() { return CreateBuilder(this); }
-    public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(TimeSync prototype) {
-      return (Builder) new Builder().MergeFrom(prototype);
-    }
-    
-    public sealed partial class Builder : pb::GeneratedBuilder<TimeSync, Builder> {
-      protected override Builder ThisBuilder {
-        get { return this; }
-      }
-      public Builder() {}
-      
-      TimeSync result = new TimeSync();
-      
-      protected override TimeSync MessageBeingBuilt {
-        get { return result; }
-      }
-      
-      public override Builder Clear() {
-        result = new TimeSync();
-        return this;
-      }
-      
-      public override Builder Clone() {
-        return new Builder().MergeFrom(result);
-      }
-      
-      public override pbd::MessageDescriptor DescriptorForType {
-        get { return global::Sirikata.Network.Protocol._PBJ_Internal.TimeSync.Descriptor; }
-      }
-      
-      public override TimeSync DefaultInstanceForType {
-        get { return global::Sirikata.Network.Protocol._PBJ_Internal.TimeSync.DefaultInstance; }
-      }
-      
-      public override TimeSync BuildPartial() {
-        if (result == null) {
-          throw new global::System.InvalidOperationException("build() has already been called on this Builder");
-        }
-        TimeSync returnMe = result;
-        result = null;
-        return returnMe;
-      }
-      
-      public override Builder MergeFrom(pb::IMessage other) {
-        if (other is TimeSync) {
-          return MergeFrom((TimeSync) other);
-        } else {
-          base.MergeFrom(other);
-          return this;
-        }
-      }
-      
-      public override Builder MergeFrom(TimeSync other) {
-        if (other == global::Sirikata.Network.Protocol._PBJ_Internal.TimeSync.DefaultInstance) return this;
-        if (other.HasClientTime) {
-          ClientTime = other.ClientTime;
-        }
-        if (other.HasServerTime) {
-          ServerTime = other.ServerTime;
-        }
-        if (other.HasSyncRound) {
-          SyncRound = other.SyncRound;
-        }
-        if (other.HasReturnOptions) {
-          ReturnOptions = other.ReturnOptions;
-        }
-        if (other.HasRoundTrip) {
-          RoundTrip = other.RoundTrip;
-        }
-        this.MergeUnknownFields(other.UnknownFields);
-        return this;
-      }
-      
-      public override Builder MergeFrom(pb::CodedInputStream input) {
-        return MergeFrom(input, pb::ExtensionRegistry.Empty);
-      }
-      
-      public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
-        pb::UnknownFieldSet.Builder unknownFields = null;
-        while (true) {
-          uint tag = input.ReadTag();
-          switch (tag) {
-            case 0: {
-              if (unknownFields != null) {
-                this.UnknownFields = unknownFields.Build();
-              }
-              return this;
-            }
-            default: {
-              if (pb::WireFormat.IsEndGroupTag(tag)) {
-                if (unknownFields != null) {
-                  this.UnknownFields = unknownFields.Build();
-                }
-                return this;
-              }
-              if (unknownFields == null) {
-                unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
-              }
-              ParseUnknownField(input, unknownFields, extensionRegistry, tag);
-              break;
-            }
-            case 73: {
-              ClientTime = input.ReadFixed64();
-              break;
-            }
-            case 81: {
-              ServerTime = input.ReadFixed64();
-              break;
-            }
-            case 88: {
-              SyncRound = input.ReadUInt64();
-              break;
-            }
-            case 112: {
-              ReturnOptions = input.ReadUInt32();
-              break;
-            }
-            case 20489: {
-              RoundTrip = input.ReadFixed64();
-              break;
-            }
-          }
-        }
-      }
-      
-      
-      public bool HasClientTime {
-        get { return result.HasClientTime; }
-      }
-      [global::System.CLSCompliant(false)]
-      public ulong ClientTime {
-        get { return result.ClientTime; }
-        set { SetClientTime(value); }
-      }
-      [global::System.CLSCompliant(false)]
-      public Builder SetClientTime(ulong value) {
-        result.hasClientTime = true;
-        result.clientTime_ = value;
-        return this;
-      }
-      public Builder ClearClientTime() {
-        result.hasClientTime = false;
-        result.clientTime_ = 0;
-        return this;
-      }
-      
-      public bool HasServerTime {
-        get { return result.HasServerTime; }
-      }
-      [global::System.CLSCompliant(false)]
-      public ulong ServerTime {
-        get { return result.ServerTime; }
-        set { SetServerTime(value); }
-      }
-      [global::System.CLSCompliant(false)]
-      public Builder SetServerTime(ulong value) {
-        result.hasServerTime = true;
-        result.serverTime_ = value;
-        return this;
-      }
-      public Builder ClearServerTime() {
-        result.hasServerTime = false;
-        result.serverTime_ = 0;
-        return this;
-      }
-      
-      public bool HasSyncRound {
-        get { return result.HasSyncRound; }
-      }
-      [global::System.CLSCompliant(false)]
-      public ulong SyncRound {
-        get { return result.SyncRound; }
-        set { SetSyncRound(value); }
-      }
-      [global::System.CLSCompliant(false)]
-      public Builder SetSyncRound(ulong value) {
-        result.hasSyncRound = true;
-        result.syncRound_ = value;
-        return this;
-      }
-      public Builder ClearSyncRound() {
-        result.hasSyncRound = false;
-        result.syncRound_ = 0UL;
-        return this;
-      }
-      
-      public bool HasReturnOptions {
-        get { return result.HasReturnOptions; }
-      }
-      [global::System.CLSCompliant(false)]
-      public uint ReturnOptions {
-        get { return result.ReturnOptions; }
-        set { SetReturnOptions(value); }
-      }
-      [global::System.CLSCompliant(false)]
-      public Builder SetReturnOptions(uint value) {
-        result.hasReturnOptions = true;
-        result.returnOptions_ = value;
-        return this;
-      }
-      public Builder ClearReturnOptions() {
-        result.hasReturnOptions = false;
-        result.returnOptions_ = 0;
-        return this;
-      }
-      
-      public bool HasRoundTrip {
-        get { return result.HasRoundTrip; }
-      }
-      [global::System.CLSCompliant(false)]
-      public ulong RoundTrip {
-        get { return result.RoundTrip; }
-        set { SetRoundTrip(value); }
-      }
-      [global::System.CLSCompliant(false)]
-      public Builder SetRoundTrip(ulong value) {
-        result.hasRoundTrip = true;
-        result.roundTrip_ = value;
-        return this;
-      }
-      public Builder ClearRoundTrip() {
-        result.hasRoundTrip = false;
-        result.roundTrip_ = 0;
-        return this;
-      }
-    }
-    static TimeSync() {
-      object.ReferenceEquals(global::Sirikata.Network.Protocol._PBJ_Internal.Time.Descriptor, null);
-    }
-  }
-  
-  #endregion
-  
-}
--- a/OpenSim/Client/Sirikata/Protocol/Time.pbj.cs
+++ b/OpenSim/Client/Sirikata/Protocol/Time.pbj.cs
@@ -1,245 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using pbd = global::Google.ProtocolBuffers.Descriptors;
-using pb = global::Google.ProtocolBuffers;
-namespace Sirikata.Network.Protocol {
-    public class TimeSync : PBJ.IMessage {
-        protected _PBJ_Internal.TimeSync super;
-        public _PBJ_Internal.TimeSync _PBJSuper{ get { return super;} }
-        public TimeSync() {
-            super=new _PBJ_Internal.TimeSync();
-        }
-        public TimeSync(_PBJ_Internal.TimeSync reference) {
-            super=reference;
-        }
-        public static TimeSync defaultInstance= new TimeSync (_PBJ_Internal.TimeSync.DefaultInstance);
-        public static TimeSync DefaultInstance{
-            get {return defaultInstance;}
-        }
-        public static pbd.MessageDescriptor Descriptor {
-            get { return _PBJ_Internal.TimeSync.Descriptor; }        }
-        public static class Types {
-        public enum ReturnOptions {
-            REPLY_RELIABLE=_PBJ_Internal.TimeSync.Types.ReturnOptions.REPLY_RELIABLE,
-            REPLY_ORDERED=_PBJ_Internal.TimeSync.Types.ReturnOptions.REPLY_ORDERED
-        };
-        }
-        public static bool WithinReservedFieldTagRange(int field_tag) {
-            return false||(field_tag>=1&&field_tag<=8)||(field_tag>=1536&&field_tag<=2560)||(field_tag>=229376&&field_tag<=294912);
-        }
-        public static bool WithinExtensionFieldTagRange(int field_tag) {
-            return false;
-        }
-        public const int ClientTimeFieldTag=9;
-        public bool HasClientTime{ get {return super.HasClientTime&&PBJ._PBJ.ValidateTime(super.ClientTime);} }
-        public PBJ.Time ClientTime{ get {
-            if (HasClientTime) {
-                return PBJ._PBJ.CastTime(super.ClientTime);
-            } else {
-                return PBJ._PBJ.CastTime();
-            }
-        }
-        }
-        public const int ServerTimeFieldTag=10;
-        public bool HasServerTime{ get {return super.HasServerTime&&PBJ._PBJ.ValidateTime(super.ServerTime);} }
-        public PBJ.Time ServerTime{ get {
-            if (HasServerTime) {
-                return PBJ._PBJ.CastTime(super.ServerTime);
-            } else {
-                return PBJ._PBJ.CastTime();
-            }
-        }
-        }
-        public const int SyncRoundFieldTag=11;
-        public bool HasSyncRound{ get {return super.HasSyncRound&&PBJ._PBJ.ValidateUint64(super.SyncRound);} }
-        public ulong SyncRound{ get {
-            if (HasSyncRound) {
-                return PBJ._PBJ.CastUint64(super.SyncRound);
-            } else {
-                return PBJ._PBJ.CastUint64();
-            }
-        }
-        }
-        public const int ReturnOptionsFieldTag=14;
-        public bool HasReturnOptions { get {
-            if (!super.HasReturnOptions) return false;
-            return PBJ._PBJ.ValidateFlags(super.ReturnOptions,(ulong)Types.ReturnOptions.REPLY_RELIABLE|(ulong)Types.ReturnOptions.REPLY_ORDERED);
-        } }
-        public uint ReturnOptions{ get {
-            if (HasReturnOptions) {
-                return (uint)PBJ._PBJ.CastFlags(super.ReturnOptions,(ulong)Types.ReturnOptions.REPLY_RELIABLE|(ulong)Types.ReturnOptions.REPLY_ORDERED);
-            } else {
-                return (uint)PBJ._PBJ.CastFlags((ulong)Types.ReturnOptions.REPLY_RELIABLE|(ulong)Types.ReturnOptions.REPLY_ORDERED);
-            }
-        }
-        }
-        public const int RoundTripFieldTag=2561;
-        public bool HasRoundTrip{ get {return super.HasRoundTrip&&PBJ._PBJ.ValidateTime(super.RoundTrip);} }
-        public PBJ.Time RoundTrip{ get {
-            if (HasRoundTrip) {
-                return PBJ._PBJ.CastTime(super.RoundTrip);
-            } else {
-                return PBJ._PBJ.CastTime();
-            }
-        }
-        }
-            public override Google.ProtocolBuffers.IMessage _PBJISuper { get { return super; } }
-        public override PBJ.IMessage.IBuilder WeakCreateBuilderForType() { return new Builder(); }
-        public static Builder CreateBuilder() { return new Builder(); }
-        public static Builder CreateBuilder(TimeSync prototype) {
-            return (Builder)new Builder().MergeFrom(prototype);
-        }
-        public static TimeSync ParseFrom(pb::ByteString data) {
-            return new TimeSync(_PBJ_Internal.TimeSync.ParseFrom(data));
-        }
-        public static TimeSync ParseFrom(pb::ByteString data, pb::ExtensionRegistry er) {
-            return new TimeSync(_PBJ_Internal.TimeSync.ParseFrom(data,er));
-        }
-        public static TimeSync ParseFrom(byte[] data) {
-            return new TimeSync(_PBJ_Internal.TimeSync.ParseFrom(data));
-        }
-        public static TimeSync ParseFrom(byte[] data, pb::ExtensionRegistry er) {
-            return new TimeSync(_PBJ_Internal.TimeSync.ParseFrom(data,er));
-        }
-        public static TimeSync ParseFrom(global::System.IO.Stream data) {
-            return new TimeSync(_PBJ_Internal.TimeSync.ParseFrom(data));
-        }
-        public static TimeSync ParseFrom(global::System.IO.Stream data, pb::ExtensionRegistry er) {
-            return new TimeSync(_PBJ_Internal.TimeSync.ParseFrom(data,er));
-        }
-        public static TimeSync ParseFrom(pb::CodedInputStream data) {
-            return new TimeSync(_PBJ_Internal.TimeSync.ParseFrom(data));
-        }
-        public static TimeSync ParseFrom(pb::CodedInputStream data, pb::ExtensionRegistry er) {
-            return new TimeSync(_PBJ_Internal.TimeSync.ParseFrom(data,er));
-        }
-        protected override bool _HasAllPBJFields{ get {
-            return true
-                ;
-        } }
-        public bool IsInitialized { get {
-            return super.IsInitialized&&_HasAllPBJFields;
-        } }
-        public class Builder : global::PBJ.IMessage.IBuilder{
-        protected override bool _HasAllPBJFields{ get {
-            return true
-                ;
-        } }
-        public bool IsInitialized { get {
-            return super.IsInitialized&&_HasAllPBJFields;
-        } }
-            protected _PBJ_Internal.TimeSync.Builder super;
-            public override Google.ProtocolBuffers.IBuilder _PBJISuper { get { return super; } }
-            public _PBJ_Internal.TimeSync.Builder _PBJSuper{ get { return super;} }
-            public Builder() {super = new _PBJ_Internal.TimeSync.Builder();}
-            public Builder(_PBJ_Internal.TimeSync.Builder other) {
-                super=other;
-            }
-            public Builder Clone() {return new Builder(super.Clone());}
-            public Builder MergeFrom(TimeSync prototype) { super.MergeFrom(prototype._PBJSuper);return this;}
-            public Builder Clear() {super.Clear();return this;}
-            public TimeSync BuildPartial() {return new TimeSync(super.BuildPartial());}
-            public TimeSync Build() {if (_HasAllPBJFields) return new TimeSync(super.Build());return null;}
-            public pbd::MessageDescriptor DescriptorForType {
-                get { return TimeSync.Descriptor; }            }
-        public Builder ClearClientTime() { super.ClearClientTime();return this;}
-        public const int ClientTimeFieldTag=9;
-        public bool HasClientTime{ get {return super.HasClientTime&&PBJ._PBJ.ValidateTime(super.ClientTime);} }
-        public PBJ.Time ClientTime{ get {
-            if (HasClientTime) {
-                return PBJ._PBJ.CastTime(super.ClientTime);
-            } else {
-                return PBJ._PBJ.CastTime();
-            }
-        }
-        set {
-            super.ClientTime=(PBJ._PBJ.Construct(value));
-        }
-        }
-        public Builder ClearServerTime() { super.ClearServerTime();return this;}
-        public const int ServerTimeFieldTag=10;
-        public bool HasServerTime{ get {return super.HasServerTime&&PBJ._PBJ.ValidateTime(super.ServerTime);} }
-        public PBJ.Time ServerTime{ get {
-            if (HasServerTime) {
-                return PBJ._PBJ.CastTime(super.ServerTime);
-            } else {
-                return PBJ._PBJ.CastTime();
-            }
-        }
-        set {
-            super.ServerTime=(PBJ._PBJ.Construct(value));
-        }
-        }
-        public Builder ClearSyncRound() { super.ClearSyncRound();return this;}
-        public const int SyncRoundFieldTag=11;
-        public bool HasSyncRound{ get {return super.HasSyncRound&&PBJ._PBJ.ValidateUint64(super.SyncRound);} }
-        public ulong SyncRound{ get {
-            if (HasSyncRound) {
-                return PBJ._PBJ.CastUint64(super.SyncRound);
-            } else {
-                return PBJ._PBJ.CastUint64();
-            }
-        }
-        set {
-            super.SyncRound=(PBJ._PBJ.Construct(value));
-        }
-        }
-        public Builder ClearReturnOptions() { super.ClearReturnOptions();return this;}
-        public const int ReturnOptionsFieldTag=14;
-        public bool HasReturnOptions { get {
-            if (!super.HasReturnOptions) return false;
-            return PBJ._PBJ.ValidateFlags(super.ReturnOptions,(ulong)Types.ReturnOptions.REPLY_RELIABLE|(ulong)Types.ReturnOptions.REPLY_ORDERED);
-        } }
-        public uint ReturnOptions{ get {
-            if (HasReturnOptions) {
-                return (uint)PBJ._PBJ.CastFlags(super.ReturnOptions,(ulong)Types.ReturnOptions.REPLY_RELIABLE|(ulong)Types.ReturnOptions.REPLY_ORDERED);
-            } else {
-                return (uint)PBJ._PBJ.CastFlags((ulong)Types.ReturnOptions.REPLY_RELIABLE|(ulong)Types.ReturnOptions.REPLY_ORDERED);
-            }
-        }
-        set {
-            super.ReturnOptions=((value));
-        }
-        }
-        public Builder ClearRoundTrip() { super.ClearRoundTrip();return this;}
-        public const int RoundTripFieldTag=2561;
-        public bool HasRoundTrip{ get {return super.HasRoundTrip&&PBJ._PBJ.ValidateTime(super.RoundTrip);} }
-        public PBJ.Time RoundTrip{ get {
-            if (HasRoundTrip) {
-                return PBJ._PBJ.CastTime(super.RoundTrip);
-            } else {
-                return PBJ._PBJ.CastTime();
-            }
-        }
-        set {
-            super.RoundTrip=(PBJ._PBJ.Construct(value));
-        }
-        }
-        }
-    }
-}
--- a/OpenSim/Client/Sirikata/SirikataModule.cs
+++ b/OpenSim/Client/Sirikata/SirikataModule.cs
@@ -1,139 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-// THIS MODULE USES CODE FROM SIRIKATA, THE SIRIKATA LICENSE IS BELOW
-/*
-Sirikata is Licensed using the revised BSD license.
-If you have any questions, contact Patrick Horn at <patrick.horn@gmail.com>
-
-
- Copyright (c) 2008, the Sirikata developers (see AUTHORS file for credit).
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
- * Neither the name of Sirikata nor the names of its contributors may
-   be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Sockets;
-using Nini.Config;
-using OpenMetaverse;
-using OpenSim.Client.Sirikata.ClientStack;
-using OpenSim.Framework;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
-namespace OpenSim.Client.Sirikata
-{
-    class SirikataModule : IRegionModule
-    {
-        private bool m_enabled = false;
-
-        private TcpListener m_listener;
-        private bool m_running = true;
-
-        private List<Scene> m_scenes = new List<Scene>();
-        private Dictionary<UUID,SirikataClientView> m_clients = new Dictionary<UUID, SirikataClientView>();
-
-        #region Implementation of IRegionModule
-
-        public void Initialise(Scene scene, IConfigSource source)
-        {
-            lock (m_scenes)
-                m_scenes.Add(scene);
-        }
-
-        public void PostInitialise()
-        {
-            if (!m_enabled)
-                return;
-
-            m_listener = new TcpListener(IPAddress.Any, 5943);
-            
-        }
-
-        private void ListenLoop()
-        {
-            while (m_running)
-            {
-                m_listener.BeginAcceptTcpClient(AcceptSocket, m_listener);
-            }
-        }
-
-        private void AcceptSocket(IAsyncResult ar)
-        {
-            TcpListener listener = (TcpListener) ar.AsyncState;
-            TcpClient client = listener.EndAcceptTcpClient(ar);
-
-            SirikataClientView clientView = new SirikataClientView(client);
-
-            lock (m_clients)
-                m_clients.Add(clientView.SessionId, clientView);
-        }
-
-        public void Close()
-        {
-            
-        }
-
-        public string Name
-        {
-            get { return "Sirikata ClientStack Module"; }
-        }
-
-        public bool IsSharedModule
-        {
-            get { return true; }
-        }
-
-        #endregion
-    }
-}
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
--- a/OpenSim/Client/VWoHTTP/VWoHTTPModule.cs
+++ b/OpenSim/Client/VWoHTTP/VWoHTTPModule.cs
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Nini.Config;
-using OpenMetaverse;
-using OpenSim.Client.VWoHTTP.ClientStack;
-using OpenSim.Framework;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
-namespace OpenSim.Client.VWoHTTP
-{
-    class VWoHTTPModule : IRegionModule, IHttpAgentHandler
-    {
-        private bool m_disabled = true;
-
-        private IHttpServer m_httpd;
-
-        private readonly List<Scene> m_scenes = new List<Scene>();
-
-        private Dictionary<UUID, VWHClientView> m_clients = new Dictionary<UUID, VWHClientView>();
-
-        #region Implementation of IRegionModule
-
-        public void Initialise(Scene scene, IConfigSource source)
-        {
-            if (m_disabled)
-                return;
-
-            m_scenes.Add(scene);
-
-            m_httpd = MainServer.Instance;
-        }
-
-        public void PostInitialise()
-        {
-            if (m_disabled)
-                return;
-
-            m_httpd.AddAgentHandler("vwohttp", this);
-        }
-
-        public void Close()
-        {
-            if (m_disabled)
-                return;
-
-            m_httpd.RemoveAgentHandler("vwohttp", this);
-        }
-
-        public string Name
-        {
-            get { return "VWoHTTP ClientStack"; }
-        }
-
-        public bool IsSharedModule
-        {
-            get { return true; }
-        }
-
-        #endregion
-
-        #region Implementation of IHttpAgentHandler
-
-        public bool Handle(OSHttpRequest req, OSHttpResponse resp)
-        {
-            string[] urlparts = req.Url.AbsolutePath.Split(new char[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
-
-            if (urlparts.Length < 2)
-                return false;
-
-            if (urlparts[1] == "connect")
-            {
-                UUID sessID = UUID.Random();
-
-                VWHClientView client = new VWHClientView(sessID, UUID.Random(), "VWoHTTPClient", m_scenes[0]);
-
-                m_clients.Add(sessID, client);
-
-                return true;
-            }
-            else
-            {
-                if (urlparts.Length < 3)
-                    return false;
-
-                UUID sessionID;
-                if (!UUID.TryParse(urlparts[1], out sessionID))
-                    return false;
-
-                if (!m_clients.ContainsKey(sessionID))
-                    return false;
-
-                return m_clients[sessionID].ProcessInMsg(req, resp);
-            }
-        }
-
-        public bool Match(OSHttpRequest req, OSHttpResponse resp)
-        {
-            return req.Url.ToString().Contains("vwohttp");
-        }
-
-        #endregion
-    }
-}
--- a/OpenSim/ConsoleClient/ConsoleClient.cs
+++ b/OpenSim/ConsoleClient/ConsoleClient.cs
@@ -33,6 +33,7 @@ using System.IO;
 using System.Xml;
 using System.Collections.Generic;
 using OpenSim.Server.Base;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenMetaverse;

--- a/OpenSim/Data/DBGuids.cs
+++ b/OpenSim/Data/DBGuids.cs
@@ -1,4 +1,31 @@
-using System;
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 using OpenMetaverse;
@@ -17,7 +44,7 @@ namespace OpenSim.Data
        /// <returns></returns>
        public static UUID FromDB(object id)
        {
-            if( (id == null) || (id == DBNull.Value))
+            if ((id == null) || (id == DBNull.Value))
                return UUID.Zero;

            if (id.GetType() == typeof(Guid))
--- a/OpenSim/Data/IAssetData.cs
+++ b/OpenSim/Data/IAssetData.cs
@@ -40,15 +40,4 @@ namespace OpenSim.Data
        void Initialise(string connect);
        bool Delete(string id);
    }
-
-    public class AssetDataInitialiser : PluginInitialiserBase
-    {
-        private string connect;
-        public AssetDataInitialiser (string s) { connect = s; }
-        public override void Initialise (IPlugin plugin)
-        {
-            IAssetDataPlugin p = plugin as IAssetDataPlugin;
-            p.Initialise (connect);
-        }
-    }
 }
--- a/OpenSim/Data/IFriendsData.cs
+++ b/OpenSim/Data/IFriendsData.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Data
 {
    public class FriendsData
    {
-        public UUID PrincipalID;
+        public string PrincipalID;
        public string Friend;
        public Dictionary<string, string> Data;
    }
@@ -46,6 +46,8 @@ namespace OpenSim.Data
    {
        bool Store(FriendsData data);
        bool Delete(UUID ownerID, string friend);
+        bool Delete(string ownerID, string friend);
        FriendsData[] GetFriends(UUID principalID);
+        FriendsData[] GetFriends(string principalID);
    }
 }
--- a/OpenSim/Data/IInventoryData.cs
+++ b/OpenSim/Data/IInventoryData.cs
@@ -155,15 +155,4 @@ namespace OpenSim.Data
        /// </returns>
        List<InventoryItemBase> fetchActiveGestures(UUID avatarID);
    }
-
-    public class InventoryDataInitialiser : PluginInitialiserBase
-    {
-        private string connect;
-        public InventoryDataInitialiser (string s) { connect = s; }
-        public override void Initialise (IPlugin plugin)
-        {
-            IInventoryDataPlugin p = plugin as IInventoryDataPlugin;
-            p.Initialise (connect);
-        }
-    }
 }
--- a/OpenSim/Data/IRegionData.cs
+++ b/OpenSim/Data/IRegionData.cs
@@ -37,10 +37,30 @@ namespace OpenSim.Data
        public UUID RegionID;
        public UUID ScopeID;
        public string RegionName;
+
+        /// <summary>
+        /// The position in meters of this region.
+        /// </summary>
        public int posX;
+
+        /// <summary>
+        /// The position in meters of this region.
+        /// </summary>
        public int posY;
+
        public int sizeX;
        public int sizeY;
+
+        /// <summary>
+        /// Return the x-coordinate of this region.
+        /// </summary>
+        public int coordX { get { return posX / (int)Constants.RegionSize; } }
+
+        /// <summary>
+        /// Return the y-coordinate of this region.
+        /// </summary>
+        public int coordY { get { return posY / (int)Constants.RegionSize; } }
+
        public Dictionary<string, object> Data;
    }

@@ -79,4 +99,26 @@ namespace OpenSim.Data
        Authenticate = 256, // Require authentication
        Hyperlink = 512 // Record represents a HG link
    }
+    
+    public class RegionDataDistanceCompare : IComparer<RegionData>
+    {
+        private Vector2 m_origin;
+
+        public RegionDataDistanceCompare(int x, int y)
+        {
+            m_origin = new Vector2(x, y);
+        }
+
+        public int Compare(RegionData regionA, RegionData regionB)
+        {
+            Vector2 vectorA = new Vector2(regionA.posX, regionA.posY);
+            Vector2 vectorB = new Vector2(regionB.posX, regionB.posY);
+            return Math.Sign(VectorDistance(m_origin, vectorA) - VectorDistance(m_origin, vectorB));
+        }
+
+        private float VectorDistance(Vector2 x, Vector2 y)
+        {
+            return (x - y).Length();
+        }
+    }
 }
--- a/OpenSim/Data/IUserAccountData.cs
+++ b/OpenSim/Data/IUserAccountData.cs
@@ -50,5 +50,6 @@ namespace OpenSim.Data
        bool Store(UserAccountData data);
        bool Delete(string field, string val);
        UserAccountData[] GetUsers(UUID scopeID, string query);
+        UserAccountData[] GetUsersWhere(UUID scopeID, string where);
    }
 }
--- a/OpenSim/Data/IXInventoryData.cs
+++ b/OpenSim/Data/IXInventoryData.cs
@@ -74,9 +74,38 @@ namespace OpenSim.Data
        bool StoreFolder(XInventoryFolder folder);
        bool StoreItem(XInventoryItem item);

+        /// <summary>
+        /// Delete folders where field == val
+        /// </summary>
+        /// <param name="field"></param>
+        /// <param name="val"></param>
+        /// <returns>true if the delete was successful, false if it was not</returns>
        bool DeleteFolders(string field, string val);
+
+        /// <summary>
+        /// Delete folders where field1 == val1, field2 == val2...
+        /// </summary>
+        /// <param name="fields"></param>
+        /// <param name="vals"></param>
+        /// <returns>true if the delete was successful, false if it was not</returns>
+        bool DeleteFolders(string[] fields, string[] vals);
+
+        /// <summary>
+        /// Delete items where field == val
+        /// </summary>
+        /// <param name="field"></param>
+        /// <param name="val"></param>
+        /// <returns>true if the delete was successful, false if it was not</returns>
        bool DeleteItems(string field, string val);

+        /// <summary>
+        /// Delete items where field1 == val1, field2 == val2...
+        /// </summary>
+        /// <param name="fields"></param>
+        /// <param name="vals"></param>
+        /// <returns>true if the delete was successful, false if it was not</returns>
+        bool DeleteItems(string[] fields, string[] vals);
+
        bool MoveItem(string id, string newParent);
        XInventoryItem[] GetActiveGestures(UUID principalID);
        int GetAssetPermissions(UUID principalID, UUID assetID);
--- a/OpenSim/Data/MSSQL/MSSQLEstateData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Data.MSSQL
    {
        private const string _migrationStore = "EstateStore";

-        private static readonly ILog _Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

        private MSSQLManager _Database;
        private string m_connectionString;
@@ -50,6 +50,15 @@ namespace OpenSim.Data.MSSQL

        #region Public methods

+        public MSSQLEstateStore()
+        {
+        }
+
+        public MSSQLEstateStore(string connectionString)
+        {
+            Initialise(connectionString);
+        }
+
        /// <summary>
        /// Initialises the estatedata class.
        /// </summary>
@@ -63,7 +72,12 @@ namespace OpenSim.Data.MSSQL
            }

            //Migration settings
-            _Database.CheckMigration(_migrationStore);
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            {
+                conn.Open();
+                Migration m = new Migration(conn, GetType().Assembly, "EstateStore");
+                m.Update();
+            }

            //Interesting way to get parameters! Maybe implement that also with other types
            Type t = typeof(EstateSettings);
@@ -103,19 +117,19 @@ namespace OpenSim.Data.MSSQL
                        {
                            FieldInfo f = _FieldMap[name];
                            object v = reader[name];
-                            if (f.FieldType == typeof(bool) )
+                            if (f.FieldType == typeof(bool))
                            {
                                f.SetValue(es, Convert.ToInt32(v) != 0);
                            }
-                            else if (f.FieldType == typeof(UUID) )
+                            else if (f.FieldType == typeof(UUID))
                            {
                                f.SetValue(es, new UUID((Guid)v)); // uuid);
                            }
-                            else if (f.FieldType == typeof(string)) 
+                            else if (f.FieldType == typeof(string))
                            {
                                f.SetValue(es, v.ToString());
                            }
-                            else if (f.FieldType == typeof(UInt32))  
+                            else if (f.FieldType == typeof(UInt32))
                            {
                                f.SetValue(es, Convert.ToUInt32(v));
                            }
@@ -134,55 +148,10 @@ namespace OpenSim.Data.MSSQL
                }
            }

-
            if (insertEstate && create)
            {
-                List<string> names = new List<string>(FieldList);
-
-                names.Remove("EstateID");
-
-                sql = string.Format("insert into estate_settings ({0}) values ( @{1})", String.Join(",", names.ToArray()), String.Join(", @", names.ToArray()));
-
-                //_Log.Debug("[DB ESTATE]: SQL: " + sql);
-                using (SqlConnection conn = new SqlConnection(m_connectionString))
-                using (SqlCommand insertCommand = new SqlCommand(sql, conn))
-                {
-                    insertCommand.CommandText = sql + " SET @ID = SCOPE_IDENTITY()";
-
-                    foreach (string name in names)
-                    {
-                        insertCommand.Parameters.Add(_Database.CreateParameter("@" + name, _FieldMap[name].GetValue(es)));
-                    }
-                    SqlParameter idParameter = new SqlParameter("@ID", SqlDbType.Int);
-                    idParameter.Direction = ParameterDirection.Output;
-                    insertCommand.Parameters.Add(idParameter);
-                    conn.Open();
-                    insertCommand.ExecuteNonQuery();
-
-                    es.EstateID = Convert.ToUInt32(idParameter.Value);
-                }
-
-                sql = "INSERT INTO [estate_map] ([RegionID] ,[EstateID]) VALUES (@RegionID, @EstateID)";
-                using (SqlConnection conn = new SqlConnection(m_connectionString))
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
-                {
-
-                    cmd.Parameters.Add(_Database.CreateParameter("@RegionID", regionID));
-                    cmd.Parameters.Add(_Database.CreateParameter("@EstateID", es.EstateID));
-                    // This will throw on dupe key
-                    try
-                    {
-                        conn.Open();
-                        cmd.ExecuteNonQuery();
-                    }
-                    catch (Exception e)
-                    {
-                        _Log.DebugFormat("[ESTATE DB]: Error inserting regionID and EstateID in estate_map: {0}", e);
-                    }
-                }
-
-                //TODO check if this is needed??
-                es.Save();
+                DoCreate(es);
+                LinkRegion(regionID, (int)es.EstateID);
            }

            LoadBanList(es);
@@ -196,6 +165,53 @@ namespace OpenSim.Data.MSSQL
            return es;
        }

+        public EstateSettings CreateNewEstate()
+        {
+            EstateSettings es = new EstateSettings();
+            es.OnSave += StoreEstateSettings;
+
+            DoCreate(es);
+
+            LoadBanList(es);
+
+            es.EstateManagers = LoadUUIDList(es.EstateID, "estate_managers");
+            es.EstateAccess = LoadUUIDList(es.EstateID, "estate_users");
+            es.EstateGroups = LoadUUIDList(es.EstateID, "estate_groups");
+
+            return es;
+        }
+
+        private void DoCreate(EstateSettings es)
+        {
+            List<string> names = new List<string>(FieldList);
+
+            names.Remove("EstateID");
+
+            string sql = string.Format("insert into estate_settings ({0}) values ( @{1})", String.Join(",", names.ToArray()), String.Join(", @", names.ToArray()));
+
+            //_Log.Debug("[DB ESTATE]: SQL: " + sql);
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand insertCommand = new SqlCommand(sql, conn))
+            {
+                insertCommand.CommandText = sql + " SET @ID = SCOPE_IDENTITY()";
+
+                foreach (string name in names)
+                {
+                    insertCommand.Parameters.Add(_Database.CreateParameter("@" + name, _FieldMap[name].GetValue(es)));
+                }
+                SqlParameter idParameter = new SqlParameter("@ID", SqlDbType.Int);
+                idParameter.Direction = ParameterDirection.Output;
+                insertCommand.Parameters.Add(idParameter);
+                conn.Open();
+                insertCommand.ExecuteNonQuery();
+
+                es.EstateID = Convert.ToUInt32(idParameter.Value);
+            }
+
+            //TODO check if this is needed??
+            es.Save();
+        }
+
        /// <summary>
        /// Stores the estate settings.
        /// </summary>
@@ -301,12 +317,12 @@ namespace OpenSim.Data.MSSQL
                conn.Open();
                using (SqlCommand cmd = conn.CreateCommand())
                {
-                    cmd.CommandText  = "delete from estateban where EstateID = @EstateID";
+                    cmd.CommandText = "delete from estateban where EstateID = @EstateID";
                    cmd.Parameters.AddWithValue("@EstateID", (int)es.EstateID);
                    cmd.ExecuteNonQuery();

                    //Insert after
-                    cmd.CommandText = "insert into estateban (EstateID, bannedUUID) values ( @EstateID, @bannedUUID )";
+                    cmd.CommandText = "insert into estateban (EstateID, bannedUUID,bannedIp, bannedIpHostMask, bannedNameMask) values ( @EstateID, @bannedUUID, '','','' )";
                    cmd.Parameters.AddWithValue("@bannedUUID", Guid.Empty);
                    foreach (EstateBan b in es.EstateBans)
                    {
@@ -341,26 +357,219 @@ namespace OpenSim.Data.MSSQL

        public EstateSettings LoadEstateSettings(int estateID)
        {
-            return new EstateSettings();
+            EstateSettings es = new EstateSettings();
+            string sql = "select estate_settings." + String.Join(",estate_settings.", FieldList) + " from estate_settings where EstateID = @EstateID";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                {
+                    cmd.Parameters.AddWithValue("@EstateID", (int)estateID);
+                    using (SqlDataReader reader = cmd.ExecuteReader())
+                    {
+                        if (reader.Read())
+                        {
+                            foreach (string name in FieldList)
+                            {
+                                FieldInfo f = _FieldMap[name];
+                                object v = reader[name];
+                                if (f.FieldType == typeof(bool))
+                                {
+                                    f.SetValue(es, Convert.ToInt32(v) != 0);
+                                }
+                                else if (f.FieldType == typeof(UUID))
+                                {
+                                    f.SetValue(es, new UUID((Guid)v)); // uuid);
+                                }
+                                else if (f.FieldType == typeof(string))
+                                {
+                                    f.SetValue(es, v.ToString());
+                                }
+                                else if (f.FieldType == typeof(UInt32))
+                                {
+                                    f.SetValue(es, Convert.ToUInt32(v));
+                                }
+                                else if (f.FieldType == typeof(Single))
+                                {
+                                    f.SetValue(es, Convert.ToSingle(v));
+                                }
+                                else
+                                    f.SetValue(es, v);
+                            }
+                        }
+
+                    }
+                }
+            }
+            LoadBanList(es);
+
+            es.EstateManagers = LoadUUIDList(es.EstateID, "estate_managers");
+            es.EstateAccess = LoadUUIDList(es.EstateID, "estate_users");
+            es.EstateGroups = LoadUUIDList(es.EstateID, "estate_groups");
+
+            //Set event
+            es.OnSave += StoreEstateSettings;
+            return es;
+
+        }
+
+        public List<EstateSettings> LoadEstateSettingsAll()
+        {
+            List<EstateSettings> allEstateSettings = new List<EstateSettings>();
+
+            List<int> allEstateIds = GetEstatesAll();
+
+            foreach (int estateId in allEstateIds)
+                allEstateSettings.Add(LoadEstateSettings(estateId));
+
+            return allEstateSettings;
        }

        public List<int> GetEstates(string search)
        {
-            return new List<int>();
+            List<int> result = new List<int>();
+            string sql = "select estateID from estate_settings where EstateName = @EstateName";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                {
+                    cmd.Parameters.AddWithValue("@EstateName", search);
+
+                    using (IDataReader reader = cmd.ExecuteReader())
+                    {
+                        while (reader.Read())
+                        {
+                            result.Add(Convert.ToInt32(reader["EstateID"]));
+                        }
+                        reader.Close();
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        public List<int> GetEstatesAll()
+        {
+            List<int> result = new List<int>();
+            string sql = "select estateID from estate_settings";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                {
+                    using (IDataReader reader = cmd.ExecuteReader())
+                    {
+                        while (reader.Read())
+                        {
+                            result.Add(Convert.ToInt32(reader["EstateID"]));
+                        }
+                        reader.Close();
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        public List<int> GetEstatesByOwner(UUID ownerID)
+        {
+            List<int> result = new List<int>();
+            string sql = "select estateID from estate_settings where EstateOwner = @EstateOwner";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                {
+                    cmd.Parameters.AddWithValue("@EstateOwner", ownerID);
+
+                    using (IDataReader reader = cmd.ExecuteReader())
+                    {
+                        while (reader.Read())
+                        {
+                            result.Add(Convert.ToInt32(reader["EstateID"]));
+                        }
+                        reader.Close();
+                    }
+                }
+            }
+
+            return result;
        }

        public bool LinkRegion(UUID regionID, int estateID)
        {
+            string deleteSQL = "delete from estate_map where RegionID = @RegionID";
+            string insertSQL = "insert into estate_map values (@RegionID, @EstateID)";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            {
+                conn.Open();
+                SqlTransaction transaction = conn.BeginTransaction();
+
+                try
+                {
+                    using (SqlCommand cmd = new SqlCommand(deleteSQL, conn))
+                    {
+                        cmd.Transaction = transaction;
+                        cmd.Parameters.AddWithValue("@RegionID", regionID.Guid);
+
+                        cmd.ExecuteNonQuery();
+                    }
+
+                    using (SqlCommand cmd = new SqlCommand(insertSQL, conn))
+                    {
+                        cmd.Transaction = transaction;
+                        cmd.Parameters.AddWithValue("@RegionID", regionID.Guid);
+                        cmd.Parameters.AddWithValue("@EstateID", estateID);
+
+                        int ret = cmd.ExecuteNonQuery();
+
+                        if (ret != 0)
+                            transaction.Commit();
+                        else
+                            transaction.Rollback();
+
+                        return (ret != 0);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    m_log.Error("[REGION DB]: LinkRegion failed: " + ex.Message);
+                    transaction.Rollback();
+                }
+            }
            return false;
        }

        public List<UUID> GetRegions(int estateID)
        {
-            return new List<UUID>();
+            List<UUID> result = new List<UUID>();
+            string sql = "select RegionID from estate_map where EstateID = @EstateID";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                {
+                    cmd.Parameters.AddWithValue("@EstateID", estateID);
+
+                    using (IDataReader reader = cmd.ExecuteReader())
+                    {
+                        while (reader.Read())
+                        {
+                            result.Add(DBGuid.FromDB(reader["RegionID"]));
+                        }
+                        reader.Close();
+                    }
+                }
+            }
+
+            return result;
        }

        public bool DeleteEstate(int estateID)
        {
+            // TODO: Implementation!            
            return false;
        }
        #endregion
--- a/OpenSim/Data/MSSQL/MSSQLFriendsData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLFriendsData.cs
@@ -51,6 +51,11 @@ namespace OpenSim.Data.MSSQL
        }

        public bool Delete(UUID principalID, string friend)
+        {
+            return Delete(principalID.ToString(), friend);
+        }
+
+        public bool Delete(string principalID, string friend)
        {
            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
            using (SqlCommand cmd = new SqlCommand())
@@ -67,6 +72,11 @@ namespace OpenSim.Data.MSSQL
        }

        public FriendsData[] GetFriends(UUID principalID)
+        {
+            return GetFriends(principalID.ToString());
+        }
+
+        public FriendsData[] GetFriends(string principalID)
        {
            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
            using (SqlCommand cmd = new SqlCommand())
--- a/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
@@ -56,15 +56,15 @@ namespace OpenSim.Data.MSSQL
                string realm, string storeName)
        {
            m_Realm = realm;
+            
+            m_ConnectionString = connectionString;

            if (storeName != String.Empty)
            {
-                Assembly assem = GetType().Assembly;
-                m_ConnectionString = connectionString;
                using (SqlConnection conn = new SqlConnection(m_ConnectionString))
                {
                    conn.Open();
-                    Migration m = new Migration(conn, assem, storeName);
+                    Migration m = new Migration(conn, GetType().Assembly, storeName);
                    m.Update();
                }

@@ -168,14 +168,13 @@ namespace OpenSim.Data.MSSQL

        protected T[] DoQuery(SqlCommand cmd)
        {
+            List<T> result = new List<T>();
            using (SqlDataReader reader = cmd.ExecuteReader())
            {
                if (reader == null)
                    return new T[0];

-                CheckColumnNames(reader);
-
-                List<T> result = new List<T>();
+                CheckColumnNames(reader);                

                while (reader.Read())
                {
@@ -262,6 +261,15 @@ namespace OpenSim.Data.MSSQL
                {
                    names.Add(fi.Name);
                    values.Add("@" + fi.Name);
+                    // Temporarily return more information about what field is unexpectedly null for
+                    // http://opensimulator.org/mantis/view.php?id=5403.  This might be due to a bug in the 
+                    // InventoryTransferModule or we may be required to substitute a DBNull here.
+                    if (fi.GetValue(row) == null)
+                        throw new NullReferenceException(
+                            string.Format(
+                                "[MSSQL GENERIC TABLE HANDLER]: Trying to store field {0} for {1} which is unexpectedly null",
+                                fi.Name, row));
+
                    if (constraintFields.Count > 0 && constraintFields.Contains(fi.Name))
                    {
                        constraints.Add(new KeyValuePair<string, string>(fi.Name, fi.GetValue(row).ToString()));
@@ -335,16 +343,33 @@ namespace OpenSim.Data.MSSQL
            }
        }

-        public virtual bool Delete(string field, string val)
+        public virtual bool Delete(string field, string key)
        {
+            return Delete(new string[] { field }, new string[] { key });
+        }
+
+        public virtual bool Delete(string[] fields, string[] keys)
+        {
+            if (fields.Length != keys.Length)
+                return false;
+
+            List<string> terms = new List<string>();
+
            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
            using (SqlCommand cmd = new SqlCommand())
            {
-                string deleteCommand = String.Format("DELETE FROM {0} WHERE [{1}] = @{1}", m_Realm, field);
-                cmd.CommandText = deleteCommand;
-                
-                cmd.Parameters.Add(m_database.CreateParameter(field, val));
+                for (int i = 0; i < fields.Length; i++)
+                {
+                    cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i]));
+                    terms.Add("[" + fields[i] + "] = @" + fields[i]);
+                }
+
+                string where = String.Join(" AND ", terms.ToArray());
+
+                string query = String.Format("DELETE FROM {0} WHERE {1}", m_Realm, where);
+
                cmd.Connection = conn;
+                cmd.CommandText = query;
                conn.Open();

                if (cmd.ExecuteNonQuery() > 0)
--- a/OpenSim/Data/MSSQL/MSSQLMigration.cs
+++ b/OpenSim/Data/MSSQL/MSSQLMigration.cs
@@ -29,16 +29,19 @@ using System;
 using System.Data;
 using System.Data.Common;
 using System.Reflection;
+using System.Data.SqlClient;

 namespace OpenSim.Data.MSSQL
 {
    public class MSSQLMigration : Migration
    {
-        public MSSQLMigration(DbConnection conn, Assembly assem, string type) : base(conn, assem, type)
+        public MSSQLMigration(DbConnection conn, Assembly assem, string type)
+            : base(conn, assem, type)
        {
        }

-        public MSSQLMigration(DbConnection conn, Assembly assem, string subtype, string type) : base(conn, assem, subtype, type)
+        public MSSQLMigration(DbConnection conn, Assembly assem, string subtype, string type)
+            : base(conn, assem, subtype, type)
        {
        }

@@ -61,10 +64,36 @@ namespace OpenSim.Data.MSSQL
                }
                catch
                {
-                    // Something went wrong, so we're version 0
+                    // Return -1 to indicate table does not exist
+                    return -1;
                }
            }
            return version;
        }
+
+        protected override void ExecuteScript(DbConnection conn, string[] script)
+        {
+            if (!(conn is SqlConnection))
+            {
+                base.ExecuteScript(conn, script);
+                return;
+            }
+
+            foreach (string sql in script)
+            {
+                try
+                {
+                    using (SqlCommand cmd = new SqlCommand(sql, (SqlConnection)conn))
+                    {
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+                catch (Exception)
+                {
+                    throw new Exception(sql);
+
+                }
+            }
+        }
    }
 }
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
@@ -70,6 +70,7 @@ namespace OpenSim.Data.MSSQL
            string sql = "select * from ["+m_Realm+"] where regionName like @regionName";
            if (scopeID != UUID.Zero)
                sql += " and ScopeID = @scopeID";
+            sql += " order by regionName";
            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
            using (SqlCommand cmd = new SqlCommand(sql, conn))
            {
@@ -315,8 +316,11 @@ namespace OpenSim.Data.MSSQL

        public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y)
        {
-            // TODO: distance-sort results
-            return Get((int)RegionFlags.FallbackRegion, scopeID);
+            List<RegionData> regions = Get((int)RegionFlags.FallbackRegion, scopeID);
+            RegionDataDistanceCompare distanceComparer = new RegionDataDistanceCompare(x, y);
+            regions.Sort(distanceComparer);
+
+            return regions;
        }

        public List<RegionData> GetHyperlinks(UUID scopeID)
--- a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Data.MSSQL
    /// <summary>
    /// A MSSQL Interface for the Region Server.
    /// </summary>
-    public class MSSQLRegionDataStore : IRegionDataStore
+    public class MSSQLSimulationData : ISimulationDataStore
    {
        private const string _migrationStore = "RegionStore";

@@ -55,6 +55,20 @@ namespace OpenSim.Data.MSSQL
        /// </summary>
        private MSSQLManager _Database;
        private string m_connectionString;
+        protected virtual Assembly Assembly
+        {
+            get { return GetType().Assembly; }
+        }
+
+        public MSSQLSimulationData()
+        {
+        }
+
+        public MSSQLSimulationData(string connectionString)
+        {
+            Initialise(connectionString);
+        }
+
        /// <summary>
        /// Initialises the region datastore
        /// </summary>
@@ -64,9 +78,13 @@ namespace OpenSim.Data.MSSQL
            m_connectionString = connectionString;
            _Database = new MSSQLManager(connectionString);

-
-            //Migration settings
-            _Database.CheckMigration(_migrationStore);
+            using (SqlConnection conn = new SqlConnection(connectionString))
+            {
+                conn.Open();
+                //New Migration settings
+                Migration m = new Migration(conn, Assembly, "RegionStore");
+                m.Update();
+            }
        }

        /// <summary>
@@ -89,7 +107,6 @@ namespace OpenSim.Data.MSSQL
            Dictionary<UUID, SceneObjectGroup> objects = new Dictionary<UUID, SceneObjectGroup>();
            SceneObjectGroup grp = null;

-
            string sql = "SELECT *, " +
                           "sort = CASE WHEN prims.UUID = prims.SceneGroupID THEN 0 ELSE 1 END " +
                           "FROM prims " +
@@ -205,7 +222,7 @@ namespace OpenSim.Data.MSSQL
                {
                    command.Parameters.Clear();
                    command.Parameters.Add(_Database.CreateParameter("@PrimID", objectPart.UUID));
-                    
+
                    List<TaskInventoryItem> inventory = new List<TaskInventoryItem>();

                    using (SqlDataReader reader = command.ExecuteReader())
@@ -232,7 +249,15 @@ namespace OpenSim.Data.MSSQL
        /// <param name="regionUUID"></param>
        public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
        {
-            _Log.InfoFormat("[MSSQL]: Adding/Changing SceneObjectGroup: {0} to region: {1}, object has {2} prims.", obj.UUID, regionUUID, obj.Children.Count);
+            uint flags = obj.RootPart.GetEffectiveObjectFlags();
+            // Eligibility check
+            //
+            if ((flags & (uint)PrimFlags.Temporary) != 0)
+                return;
+            if ((flags & (uint)PrimFlags.TemporaryOnRez) != 0)
+                return;
+
+            _Log.DebugFormat("[MSSQL]: Adding/Changing SceneObjectGroup: {0} to region: {1}, object has {2} prims.", obj.UUID, regionUUID, obj.Parts.Length);

            using (SqlConnection conn = new SqlConnection(m_connectionString))
            {
@@ -241,7 +266,7 @@ namespace OpenSim.Data.MSSQL

                try
                {
-                    foreach (SceneObjectPart sceneObjectPart in obj.Children.Values)
+                    foreach (SceneObjectPart sceneObjectPart in obj.Parts)
                    {
                        //Update prim
                        using (SqlCommand sqlCommand = conn.CreateCommand())
@@ -291,7 +316,6 @@ namespace OpenSim.Data.MSSQL
                    }
                }
            }
-
        }

        /// <summary>
@@ -327,7 +351,7 @@ IF EXISTS (SELECT UUID FROM prims WHERE UUID = @UUID)
            ScriptAccessPin = @ScriptAccessPin, AllowedDrop = @AllowedDrop, DieAtEdge = @DieAtEdge, SalePrice = @SalePrice, 
            SaleType = @SaleType, ColorR = @ColorR, ColorG = @ColorG, ColorB = @ColorB, ColorA = @ColorA, ParticleSystem = @ParticleSystem, 
            ClickAction = @ClickAction, Material = @Material, CollisionSound = @CollisionSound, CollisionSoundVolume = @CollisionSoundVolume, PassTouches = @PassTouches,
-            LinkNumber = @LinkNumber
+            LinkNumber = @LinkNumber, MediaURL = @MediaURL
        WHERE UUID = @UUID
    END
 ELSE
@@ -342,7 +366,7 @@ ELSE
            PayPrice, PayButton1, PayButton2, PayButton3, PayButton4, LoopedSound, LoopedSoundGain, TextureAnimation, OmegaX, 
            OmegaY, OmegaZ, CameraEyeOffsetX, CameraEyeOffsetY, CameraEyeOffsetZ, CameraAtOffsetX, CameraAtOffsetY, CameraAtOffsetZ, 
            ForceMouselook, ScriptAccessPin, AllowedDrop, DieAtEdge, SalePrice, SaleType, ColorR, ColorG, ColorB, ColorA, 
-            ParticleSystem, ClickAction, Material, CollisionSound, CollisionSoundVolume, PassTouches, LinkNumber
+            ParticleSystem, ClickAction, Material, CollisionSound, CollisionSoundVolume, PassTouches, LinkNumber, MediaURL
            ) VALUES (
            @UUID, @CreationDate, @Name, @Text, @Description, @SitName, @TouchName, @ObjectFlags, @OwnerMask, @NextOwnerMask, @GroupMask, 
            @EveryoneMask, @BaseMask, @PositionX, @PositionY, @PositionZ, @GroupPositionX, @GroupPositionY, @GroupPositionZ, @VelocityX, 
@@ -352,7 +376,7 @@ ELSE
            @PayPrice, @PayButton1, @PayButton2, @PayButton3, @PayButton4, @LoopedSound, @LoopedSoundGain, @TextureAnimation, @OmegaX, 
            @OmegaY, @OmegaZ, @CameraEyeOffsetX, @CameraEyeOffsetY, @CameraEyeOffsetZ, @CameraAtOffsetX, @CameraAtOffsetY, @CameraAtOffsetZ, 
            @ForceMouselook, @ScriptAccessPin, @AllowedDrop, @DieAtEdge, @SalePrice, @SaleType, @ColorR, @ColorG, @ColorB, @ColorA, 
-            @ParticleSystem, @ClickAction, @Material, @CollisionSound, @CollisionSoundVolume, @PassTouches, @LinkNumber
+            @ParticleSystem, @ClickAction, @Material, @CollisionSound, @CollisionSoundVolume, @PassTouches, @LinkNumber, @MediaURL
            )
    END";

@@ -385,7 +409,7 @@ IF EXISTS (SELECT UUID FROM primshapes WHERE UUID = @UUID)
            PathSkew = @PathSkew, PathCurve = @PathCurve, PathRadiusOffset = @PathRadiusOffset, PathRevolutions = @PathRevolutions, 
            PathTaperX = @PathTaperX, PathTaperY = @PathTaperY, PathTwist = @PathTwist, PathTwistBegin = @PathTwistBegin, 
            ProfileBegin = @ProfileBegin, ProfileEnd = @ProfileEnd, ProfileCurve = @ProfileCurve, ProfileHollow = @ProfileHollow, 
-            Texture = @Texture, ExtraParams = @ExtraParams, State = @State
+            Texture = @Texture, ExtraParams = @ExtraParams, State = @State, Media = @Media
        WHERE UUID = @UUID
    END
 ELSE
@@ -394,11 +418,11 @@ ELSE
            primshapes (
            UUID, Shape, ScaleX, ScaleY, ScaleZ, PCode, PathBegin, PathEnd, PathScaleX, PathScaleY, PathShearX, PathShearY, 
            PathSkew, PathCurve, PathRadiusOffset, PathRevolutions, PathTaperX, PathTaperY, PathTwist, PathTwistBegin, ProfileBegin, 
-            ProfileEnd, ProfileCurve, ProfileHollow, Texture, ExtraParams, State
+            ProfileEnd, ProfileCurve, ProfileHollow, Texture, ExtraParams, State, Media
            ) VALUES (
            @UUID, @Shape, @ScaleX, @ScaleY, @ScaleZ, @PCode, @PathBegin, @PathEnd, @PathScaleX, @PathScaleY, @PathShearX, @PathShearY, 
            @PathSkew, @PathCurve, @PathRadiusOffset, @PathRevolutions, @PathTaperX, @PathTaperY, @PathTwist, @PathTwistBegin, @ProfileBegin, 
-            @ProfileEnd, @ProfileCurve, @ProfileHollow, @Texture, @ExtraParams, @State
+            @ProfileEnd, @ProfileCurve, @ProfileHollow, @Texture, @ExtraParams, @State, @Media
            )
    END";

@@ -484,12 +508,11 @@ ELSE
            using (SqlConnection conn = new SqlConnection(m_connectionString))
            using (SqlCommand cmd = new SqlCommand(sql, conn))
            {
+                conn.Open();
                foreach (TaskInventoryItem taskItem in items)
                {
                    cmd.Parameters.AddRange(CreatePrimInventoryParameters(taskItem));
-                    conn.Open();
                    cmd.ExecuteNonQuery();
-
                    cmd.Parameters.Clear();
                }
            }
@@ -640,9 +663,9 @@ ELSE

            //Insert new values
            string sql = @"INSERT INTO [land] 
-([UUID],[RegionUUID],[LocalLandID],[Bitmap],[Name],[Description],[OwnerUUID],[IsGroupOwned],[Area],[AuctionID],[Category],[ClaimDate],[ClaimPrice],[GroupUUID],[SalePrice],[LandStatus],[LandFlags],[LandingType],[MediaAutoScale],[MediaTextureUUID],[MediaURL],[MusicURL],[PassHours],[PassPrice],[SnapshotUUID],[UserLocationX],[UserLocationY],[UserLocationZ],[UserLookAtX],[UserLookAtY],[UserLookAtZ],[AuthbuyerID],[OtherCleanTime],[Dwell])
+([UUID],[RegionUUID],[LocalLandID],[Bitmap],[Name],[Description],[OwnerUUID],[IsGroupOwned],[Area],[AuctionID],[Category],[ClaimDate],[ClaimPrice],[GroupUUID],[SalePrice],[LandStatus],[LandFlags],[LandingType],[MediaAutoScale],[MediaTextureUUID],[MediaURL],[MusicURL],[PassHours],[PassPrice],[SnapshotUUID],[UserLocationX],[UserLocationY],[UserLocationZ],[UserLookAtX],[UserLookAtY],[UserLookAtZ],[AuthbuyerID],[OtherCleanTime])
 VALUES
-(@UUID,@RegionUUID,@LocalLandID,@Bitmap,@Name,@Description,@OwnerUUID,@IsGroupOwned,@Area,@AuctionID,@Category,@ClaimDate,@ClaimPrice,@GroupUUID,@SalePrice,@LandStatus,@LandFlags,@LandingType,@MediaAutoScale,@MediaTextureUUID,@MediaURL,@MusicURL,@PassHours,@PassPrice,@SnapshotUUID,@UserLocationX,@UserLocationY,@UserLocationZ,@UserLookAtX,@UserLookAtY,@UserLookAtZ,@AuthbuyerID,@OtherCleanTime,@Dwell)";
+(@UUID,@RegionUUID,@LocalLandID,@Bitmap,@Name,@Description,@OwnerUUID,@IsGroupOwned,@Area,@AuctionID,@Category,@ClaimDate,@ClaimPrice,@GroupUUID,@SalePrice,@LandStatus,@LandFlags,@LandingType,@MediaAutoScale,@MediaTextureUUID,@MediaURL,@MusicURL,@PassHours,@PassPrice,@SnapshotUUID,@UserLocationX,@UserLocationY,@UserLocationZ,@UserLookAtX,@UserLookAtY,@UserLookAtZ,@AuthbuyerID,@OtherCleanTime)";

            using (SqlConnection conn = new SqlConnection(m_connectionString))
            using (SqlCommand cmd = new SqlCommand(sql, conn))
@@ -658,7 +681,7 @@ VALUES
            using (SqlCommand cmd = new SqlCommand(sql, conn))
            {
                conn.Open();
-                foreach (ParcelManager.ParcelAccessEntry parcelAccessEntry in parcel.LandData.ParcelAccessList)
+                foreach (LandAccessEntry parcelAccessEntry in parcel.LandData.ParcelAccessList)
                {
                    cmd.Parameters.AddRange(CreateLandAccessParameters(parcelAccessEntry, parcel.RegionUUID));

@@ -693,13 +716,470 @@ VALUES
        }
        public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
        {
-            //This connector doesn't support the windlight module yet
-            //Return default LL windlight settings
-            return new RegionLightShareData();
+            RegionLightShareData nWP = new RegionLightShareData();
+            nWP.OnSave += StoreRegionWindlightSettings;
+            string sql = "select * from [regionwindlight] where region_id = @regionID";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(_Database.CreateParameter("@regionID", regionUUID));
+                conn.Open();
+                using (SqlDataReader result = cmd.ExecuteReader())
+                {
+                    if (!result.Read())
+                    {
+                        //No result, so store our default windlight profile and return it
+                        nWP.regionID = regionUUID;
+                        StoreRegionWindlightSettings(nWP);
+                        return nWP;
+                    }
+                    else
+                    {
+                        nWP.regionID = DBGuid.FromDB(result["region_id"]);
+                        nWP.waterColor.X = Convert.ToSingle(result["water_color_r"]);
+                        nWP.waterColor.Y = Convert.ToSingle(result["water_color_g"]);
+                        nWP.waterColor.Z = Convert.ToSingle(result["water_color_b"]);
+                        nWP.waterFogDensityExponent = Convert.ToSingle(result["water_fog_density_exponent"]);
+                        nWP.underwaterFogModifier = Convert.ToSingle(result["underwater_fog_modifier"]);
+                        nWP.reflectionWaveletScale.X = Convert.ToSingle(result["reflection_wavelet_scale_1"]);
+                        nWP.reflectionWaveletScale.Y = Convert.ToSingle(result["reflection_wavelet_scale_2"]);
+                        nWP.reflectionWaveletScale.Z = Convert.ToSingle(result["reflection_wavelet_scale_3"]);
+                        nWP.fresnelScale = Convert.ToSingle(result["fresnel_scale"]);
+                        nWP.fresnelOffset = Convert.ToSingle(result["fresnel_offset"]);
+                        nWP.refractScaleAbove = Convert.ToSingle(result["refract_scale_above"]);
+                        nWP.refractScaleBelow = Convert.ToSingle(result["refract_scale_below"]);
+                        nWP.blurMultiplier = Convert.ToSingle(result["blur_multiplier"]);
+                        nWP.bigWaveDirection.X = Convert.ToSingle(result["big_wave_direction_x"]);
+                        nWP.bigWaveDirection.Y = Convert.ToSingle(result["big_wave_direction_y"]);
+                        nWP.littleWaveDirection.X = Convert.ToSingle(result["little_wave_direction_x"]);
+                        nWP.littleWaveDirection.Y = Convert.ToSingle(result["little_wave_direction_y"]);
+                        UUID.TryParse(result["normal_map_texture"].ToString(), out nWP.normalMapTexture);
+                        nWP.horizon.X = Convert.ToSingle(result["horizon_r"]);
+                        nWP.horizon.Y = Convert.ToSingle(result["horizon_g"]);
+                        nWP.horizon.Z = Convert.ToSingle(result["horizon_b"]);
+                        nWP.horizon.W = Convert.ToSingle(result["horizon_i"]);
+                        nWP.hazeHorizon = Convert.ToSingle(result["haze_horizon"]);
+                        nWP.blueDensity.X = Convert.ToSingle(result["blue_density_r"]);
+                        nWP.blueDensity.Y = Convert.ToSingle(result["blue_density_g"]);
+                        nWP.blueDensity.Z = Convert.ToSingle(result["blue_density_b"]);
+                        nWP.blueDensity.W = Convert.ToSingle(result["blue_density_i"]);
+                        nWP.hazeDensity = Convert.ToSingle(result["haze_density"]);
+                        nWP.densityMultiplier = Convert.ToSingle(result["density_multiplier"]);
+                        nWP.distanceMultiplier = Convert.ToSingle(result["distance_multiplier"]);
+                        nWP.maxAltitude = Convert.ToUInt16(result["max_altitude"]);
+                        nWP.sunMoonColor.X = Convert.ToSingle(result["sun_moon_color_r"]);
+                        nWP.sunMoonColor.Y = Convert.ToSingle(result["sun_moon_color_g"]);
+                        nWP.sunMoonColor.Z = Convert.ToSingle(result["sun_moon_color_b"]);
+                        nWP.sunMoonColor.W = Convert.ToSingle(result["sun_moon_color_i"]);
+                        nWP.sunMoonPosition = Convert.ToSingle(result["sun_moon_position"]);
+                        nWP.ambient.X = Convert.ToSingle(result["ambient_r"]);
+                        nWP.ambient.Y = Convert.ToSingle(result["ambient_g"]);
+                        nWP.ambient.Z = Convert.ToSingle(result["ambient_b"]);
+                        nWP.ambient.W = Convert.ToSingle(result["ambient_i"]);
+                        nWP.eastAngle = Convert.ToSingle(result["east_angle"]);
+                        nWP.sunGlowFocus = Convert.ToSingle(result["sun_glow_focus"]);
+                        nWP.sunGlowSize = Convert.ToSingle(result["sun_glow_size"]);
+                        nWP.sceneGamma = Convert.ToSingle(result["scene_gamma"]);
+                        nWP.starBrightness = Convert.ToSingle(result["star_brightness"]);
+                        nWP.cloudColor.X = Convert.ToSingle(result["cloud_color_r"]);
+                        nWP.cloudColor.Y = Convert.ToSingle(result["cloud_color_g"]);
+                        nWP.cloudColor.Z = Convert.ToSingle(result["cloud_color_b"]);
+                        nWP.cloudColor.W = Convert.ToSingle(result["cloud_color_i"]);
+                        nWP.cloudXYDensity.X = Convert.ToSingle(result["cloud_x"]);
+                        nWP.cloudXYDensity.Y = Convert.ToSingle(result["cloud_y"]);
+                        nWP.cloudXYDensity.Z = Convert.ToSingle(result["cloud_density"]);
+                        nWP.cloudCoverage = Convert.ToSingle(result["cloud_coverage"]);
+                        nWP.cloudScale = Convert.ToSingle(result["cloud_scale"]);
+                        nWP.cloudDetailXYDensity.X = Convert.ToSingle(result["cloud_detail_x"]);
+                        nWP.cloudDetailXYDensity.Y = Convert.ToSingle(result["cloud_detail_y"]);
+                        nWP.cloudDetailXYDensity.Z = Convert.ToSingle(result["cloud_detail_density"]);
+                        nWP.cloudScrollX = Convert.ToSingle(result["cloud_scroll_x"]);
+                        nWP.cloudScrollXLock = Convert.ToBoolean(result["cloud_scroll_x_lock"]);
+                        nWP.cloudScrollY = Convert.ToSingle(result["cloud_scroll_y"]);
+                        nWP.cloudScrollYLock = Convert.ToBoolean(result["cloud_scroll_y_lock"]);
+                        nWP.drawClassicClouds = Convert.ToBoolean(result["draw_classic_clouds"]);
+                        nWP.valid = true;
+                    }
+                }
+            }
+            return nWP;
        }
+
+        public void RemoveRegionWindlightSettings(UUID regionID)
+        {
+            string sql = "delete from [regionwindlight] where region_id = @region_id";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            {
+                conn.Open();
+                cmd.Parameters.Add(_Database.CreateParameter("@region_id", regionID));
+                cmd.ExecuteNonQuery();
+            }
+        }
+
        public void StoreRegionWindlightSettings(RegionLightShareData wl)
        {
-            //This connector doesn't support the windlight module yet
+            string sql = "select count (region_id) from regionwindlight where region_id = @region_id";
+            bool exists = false;
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                {
+                    cmd.Parameters.Add(_Database.CreateParameter("@region_id", wl.regionID));
+                    exists = (int)cmd.ExecuteScalar() > 0;
+                }
+            }
+            if (exists)
+            {
+                RemoveRegionWindlightSettings(wl.regionID);
+            }
+
+            // sql insert
+            sql = @"INSERT INTO [regionwindlight]
+                       ([region_id]
+                       ,[water_color_r]
+                       ,[water_color_g]
+                       ,[water_color_b]
+                       ,[water_fog_density_exponent]
+                       ,[underwater_fog_modifier]
+                       ,[reflection_wavelet_scale_1]
+                       ,[reflection_wavelet_scale_2]
+                       ,[reflection_wavelet_scale_3]
+                       ,[fresnel_scale]
+                       ,[fresnel_offset]
+                       ,[refract_scale_above]
+                       ,[refract_scale_below]
+                       ,[blur_multiplier]
+                       ,[big_wave_direction_x]
+                       ,[big_wave_direction_y]
+                       ,[little_wave_direction_x]
+                       ,[little_wave_direction_y]
+                       ,[normal_map_texture]
+                       ,[horizon_r]
+                       ,[horizon_g]
+                       ,[horizon_b]
+                       ,[horizon_i]
+                       ,[haze_horizon]
+                       ,[blue_density_r]
+                       ,[blue_density_g]
+                       ,[blue_density_b]
+                       ,[blue_density_i]
+                       ,[haze_density]
+                       ,[density_multiplier]
+                       ,[distance_multiplier]
+                       ,[max_altitude]
+                       ,[sun_moon_color_r]
+                       ,[sun_moon_color_g]
+                       ,[sun_moon_color_b]
+                       ,[sun_moon_color_i]
+                       ,[sun_moon_position]
+                       ,[ambient_r]
+                       ,[ambient_g]
+                       ,[ambient_b]
+                       ,[ambient_i]
+                       ,[east_angle]
+                       ,[sun_glow_focus]
+                       ,[sun_glow_size]
+                       ,[scene_gamma]
+                       ,[star_brightness]
+                       ,[cloud_color_r]
+                       ,[cloud_color_g]
+                       ,[cloud_color_b]
+                       ,[cloud_color_i]
+                       ,[cloud_x]
+                       ,[cloud_y]
+                       ,[cloud_density]
+                       ,[cloud_coverage]
+                       ,[cloud_scale]
+                       ,[cloud_detail_x]
+                       ,[cloud_detail_y]
+                       ,[cloud_detail_density]
+                       ,[cloud_scroll_x]
+                       ,[cloud_scroll_x_lock]
+                       ,[cloud_scroll_y]
+                       ,[cloud_scroll_y_lock]
+                       ,[draw_classic_clouds])
+                 VALUES
+                       (@region_id
+                       ,@water_color_r
+                       ,@water_color_g
+                       ,@water_color_b
+                       ,@water_fog_density_exponent
+                       ,@underwater_fog_modifier
+                       ,@reflection_wavelet_scale_1
+                       ,@reflection_wavelet_scale_2
+                       ,@reflection_wavelet_scale_3
+                       ,@fresnel_scale
+                       ,@fresnel_offset
+                       ,@refract_scale_above
+                       ,@refract_scale_below
+                       ,@blur_multiplier
+                       ,@big_wave_direction_x
+                       ,@big_wave_direction_y
+                       ,@little_wave_direction_x
+                       ,@little_wave_direction_y
+                       ,@normal_map_texture
+                       ,@horizon_r
+                       ,@horizon_g
+                       ,@horizon_b
+                       ,@horizon_i
+                       ,@haze_horizon
+                       ,@blue_density_r
+                       ,@blue_density_g
+                       ,@blue_density_b
+                       ,@blue_density_i
+                       ,@haze_density
+                       ,@density_multiplier
+                       ,@distance_multiplier
+                       ,@max_altitude
+                       ,@sun_moon_color_r
+                       ,@sun_moon_color_g
+                       ,@sun_moon_color_b
+                       ,@sun_moon_color_i
+                       ,@sun_moon_position
+                       ,@ambient_r
+                       ,@ambient_g
+                       ,@ambient_b
+                       ,@ambient_i
+                       ,@east_angle
+                       ,@sun_glow_focus
+                       ,@sun_glow_size
+                       ,@scene_gamma
+                       ,@star_brightness
+                       ,@cloud_color_r
+                       ,@cloud_color_g
+                       ,@cloud_color_b
+                       ,@cloud_color_i
+                       ,@cloud_x
+                       ,@cloud_y
+                       ,@cloud_density
+                       ,@cloud_coverage
+                       ,@cloud_scale
+                       ,@cloud_detail_x
+                       ,@cloud_detail_y
+                       ,@cloud_detail_density
+                       ,@cloud_scroll_x
+                       ,@cloud_scroll_x_lock
+                       ,@cloud_scroll_y
+                       ,@cloud_scroll_y_lock
+                       ,@draw_classic_clouds)";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                {
+                    cmd.Parameters.Add(_Database.CreateParameter("region_id", wl.regionID));
+                    cmd.Parameters.Add(_Database.CreateParameter("water_color_r", wl.waterColor.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("water_color_g", wl.waterColor.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("water_color_b", wl.waterColor.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("water_fog_density_exponent", wl.waterFogDensityExponent));
+                    cmd.Parameters.Add(_Database.CreateParameter("underwater_fog_modifier", wl.underwaterFogModifier));
+                    cmd.Parameters.Add(_Database.CreateParameter("reflection_wavelet_scale_1", wl.reflectionWaveletScale.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("reflection_wavelet_scale_2", wl.reflectionWaveletScale.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("reflection_wavelet_scale_3", wl.reflectionWaveletScale.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("fresnel_scale", wl.fresnelScale));
+                    cmd.Parameters.Add(_Database.CreateParameter("fresnel_offset", wl.fresnelOffset));
+                    cmd.Parameters.Add(_Database.CreateParameter("refract_scale_above", wl.refractScaleAbove));
+                    cmd.Parameters.Add(_Database.CreateParameter("refract_scale_below", wl.refractScaleBelow));
+                    cmd.Parameters.Add(_Database.CreateParameter("blur_multiplier", wl.blurMultiplier));
+                    cmd.Parameters.Add(_Database.CreateParameter("big_wave_direction_x", wl.bigWaveDirection.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("big_wave_direction_y", wl.bigWaveDirection.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("little_wave_direction_x", wl.littleWaveDirection.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("little_wave_direction_y", wl.littleWaveDirection.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("normal_map_texture", wl.normalMapTexture));
+                    cmd.Parameters.Add(_Database.CreateParameter("horizon_r", wl.horizon.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("horizon_g", wl.horizon.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("horizon_b", wl.horizon.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("horizon_i", wl.horizon.W));
+                    cmd.Parameters.Add(_Database.CreateParameter("haze_horizon", wl.hazeHorizon));
+                    cmd.Parameters.Add(_Database.CreateParameter("blue_density_r", wl.blueDensity.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("blue_density_g", wl.blueDensity.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("blue_density_b", wl.blueDensity.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("blue_density_i", wl.blueDensity.W));
+                    cmd.Parameters.Add(_Database.CreateParameter("haze_density", wl.hazeDensity));
+                    cmd.Parameters.Add(_Database.CreateParameter("density_multiplier", wl.densityMultiplier));
+                    cmd.Parameters.Add(_Database.CreateParameter("distance_multiplier", wl.distanceMultiplier));
+                    cmd.Parameters.Add(_Database.CreateParameter("max_altitude", wl.maxAltitude));
+                    cmd.Parameters.Add(_Database.CreateParameter("sun_moon_color_r", wl.sunMoonColor.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("sun_moon_color_g", wl.sunMoonColor.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("sun_moon_color_b", wl.sunMoonColor.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("sun_moon_color_i", wl.sunMoonColor.W));
+                    cmd.Parameters.Add(_Database.CreateParameter("sun_moon_position", wl.sunMoonPosition));
+                    cmd.Parameters.Add(_Database.CreateParameter("ambient_r", wl.ambient.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("ambient_g", wl.ambient.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("ambient_b", wl.ambient.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("ambient_i", wl.ambient.W));
+                    cmd.Parameters.Add(_Database.CreateParameter("east_angle", wl.eastAngle));
+                    cmd.Parameters.Add(_Database.CreateParameter("sun_glow_focus", wl.sunGlowFocus));
+                    cmd.Parameters.Add(_Database.CreateParameter("sun_glow_size", wl.sunGlowSize));
+                    cmd.Parameters.Add(_Database.CreateParameter("scene_gamma", wl.sceneGamma));
+                    cmd.Parameters.Add(_Database.CreateParameter("star_brightness", wl.starBrightness));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_color_r", wl.cloudColor.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_color_g", wl.cloudColor.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_color_b", wl.cloudColor.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_color_i", wl.cloudColor.W));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_x", wl.cloudXYDensity.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_y", wl.cloudXYDensity.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_density", wl.cloudXYDensity.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_coverage", wl.cloudCoverage));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_scale", wl.cloudScale));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_detail_x", wl.cloudDetailXYDensity.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_detail_y", wl.cloudDetailXYDensity.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_detail_density", wl.cloudDetailXYDensity.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_scroll_x", wl.cloudScrollX));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_scroll_x_lock", wl.cloudScrollXLock));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_scroll_y", wl.cloudScrollY));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_scroll_y_lock", wl.cloudScrollYLock));
+                    cmd.Parameters.Add(_Database.CreateParameter("draw_classic_clouds", wl.drawClassicClouds));
+
+                    cmd.ExecuteNonQuery();
+                }
+            }
+            #region update
+            //            }
+            //            else
+            //            {
+            //                // sql update
+            //                sql = @"UPDATE [OpenSim].[dbo].[regionwindlight]
+            //   SET [region_id] =                   @region_id
+            //      ,[water_color_r] =               @water_color_r
+            //      ,[water_color_g] =               @water_color_g
+            //      ,[water_color_b] =               @water_color_b
+            //      ,[water_fog_density_exponent] =  @water_fog_density_exponent
+            //      ,[underwater_fog_modifier] =     @underwater_fog_modifier
+            //      ,[reflection_wavelet_scale_1] =  @reflection_wavelet_scale_1
+            //      ,[reflection_wavelet_scale_2] =  @reflection_wavelet_scale_2
+            //      ,[reflection_wavelet_scale_3] =  @reflection_wavelet_scale_3
+            //      ,[fresnel_scale] =               @fresnel_scale
+            //      ,[fresnel_offset] =              @fresnel_offset
+            //      ,[refract_scale_above] =         @refract_scale_above
+            //      ,[refract_scale_below] =         @refract_scale_below
+            //      ,[blur_multiplier] =             @blur_multiplier
+            //      ,[big_wave_direction_x] =        @big_wave_direction_x
+            //      ,[big_wave_direction_y] =        @big_wave_direction_y
+            //      ,[little_wave_direction_x] =     @little_wave_direction_x
+            //      ,[little_wave_direction_y] =     @little_wave_direction_y
+            //      ,[normal_map_texture] =          @normal_map_texture
+            //      ,[horizon_r] =                   @horizon_r
+            //      ,[horizon_g] =                   @horizon_g
+            //      ,[horizon_b] =                   @horizon_b
+            //      ,[horizon_i] =                   @horizon_i
+            //      ,[haze_horizon] =                @haze_horizon
+            //      ,[blue_density_r] =              @blue_density_r
+            //      ,[blue_density_g] =              @blue_density_g
+            //      ,[blue_density_b] =              @blue_density_b
+            //      ,[blue_density_i] =              @blue_density_i
+            //      ,[haze_density] =                @haze_density
+            //      ,[density_multiplier] =          @density_multiplier
+            //      ,[distance_multiplier] =         @distance_multiplier
+            //      ,[max_altitude] =                @max_altitude
+            //      ,[sun_moon_color_r] =            @sun_moon_color_r
+            //      ,[sun_moon_color_g] =            @sun_moon_color_g
+            //      ,[sun_moon_color_b] =            @sun_moon_color_b
+            //      ,[sun_moon_color_i] =            @sun_moon_color_i
+            //      ,[sun_moon_position] =           @sun_moon_position
+            //      ,[ambient_r] =                   @ambient_r
+            //      ,[ambient_g] =                   @ambient_g
+            //      ,[ambient_b] =                   @ambient_b
+            //      ,[ambient_i] =                   @ambient_i
+            //      ,[east_angle] =                  @east_angle
+            //      ,[sun_glow_focus] =              @sun_glow_focus
+            //      ,[sun_glow_size] =               @sun_glow_size
+            //      ,[scene_gamma] =                 @scene_gamma
+            //      ,[star_brightness] =             @star_brightness
+            //      ,[cloud_color_r] =               @cloud_color_r
+            //      ,[cloud_color_g] =               @cloud_color_g
+            //      ,[cloud_color_b] =               @cloud_color_b
+            //      ,[cloud_color_i] =               @cloud_color_i
+            //      ,[cloud_x] =                     @cloud_x
+            //      ,[cloud_y] =                     @cloud_y
+            //      ,[cloud_density] =               @cloud_density
+            //      ,[cloud_coverage] =              @cloud_coverage
+            //      ,[cloud_scale] =                 @cloud_scale
+            //      ,[cloud_detail_x] =              @cloud_detail_x
+            //      ,[cloud_detail_y] =              @cloud_detail_y
+            //      ,[cloud_detail_density] =        @cloud_detail_density
+            //      ,[cloud_scroll_x] =              @cloud_scroll_x
+            //      ,[cloud_scroll_x_lock] =         @cloud_scroll_x_lock
+            //      ,[cloud_scroll_y] =              @cloud_scroll_y
+            //      ,[cloud_scroll_y_lock] =         @cloud_scroll_y_lock
+            //      ,[draw_classic_clouds] =         @draw_classic_clouds
+            // WHERE region_id = @region_id";
+            //                using (SqlConnection conn = new SqlConnection(m_connectionString))
+            //                {
+            //                    conn.Open();
+            //                    using (SqlCommand cmd = new SqlCommand(sql, conn))
+            //                    {
+            //                        cmd.Parameters.AddWithValue("region_id", wl.regionID);
+            //                        cmd.Parameters.AddWithValue("water_color_r", wl.waterColor.X);
+            //                        cmd.Parameters.AddWithValue("water_color_g", wl.waterColor.Y);
+            //                        cmd.Parameters.AddWithValue("water_color_b", wl.waterColor.Z);
+            //                        cmd.Parameters.AddWithValue("water_fog_density_exponent", wl.waterFogDensityExponent);
+            //                        cmd.Parameters.AddWithValue("underwater_fog_modifier", wl.underwaterFogModifier);
+            //                        cmd.Parameters.AddWithValue("reflection_wavelet_scale_1", wl.reflectionWaveletScale.X);
+            //                        cmd.Parameters.AddWithValue("reflection_wavelet_scale_2", wl.reflectionWaveletScale.Y);
+            //                        cmd.Parameters.AddWithValue("reflection_wavelet_scale_3", wl.reflectionWaveletScale.Z);
+            //                        cmd.Parameters.AddWithValue("fresnel_scale", wl.fresnelScale);
+            //                        cmd.Parameters.AddWithValue("fresnel_offset", wl.fresnelOffset);
+            //                        cmd.Parameters.AddWithValue("refract_scale_above", wl.refractScaleAbove);
+            //                        cmd.Parameters.AddWithValue("refract_scale_below", wl.refractScaleBelow);
+            //                        cmd.Parameters.AddWithValue("blur_multiplier", wl.blurMultiplier);
+            //                        cmd.Parameters.AddWithValue("big_wave_direction_x", wl.bigWaveDirection.X);
+            //                        cmd.Parameters.AddWithValue("big_wave_direction_y", wl.bigWaveDirection.Y);
+            //                        cmd.Parameters.AddWithValue("little_wave_direction_x", wl.littleWaveDirection.X);
+            //                        cmd.Parameters.AddWithValue("little_wave_direction_y", wl.littleWaveDirection.Y);
+            //                        cmd.Parameters.AddWithValue("normal_map_texture", wl.normalMapTexture);
+            //                        cmd.Parameters.AddWithValue("horizon_r", wl.horizon.X);
+            //                        cmd.Parameters.AddWithValue("horizon_g", wl.horizon.Y);
+            //                        cmd.Parameters.AddWithValue("horizon_b", wl.horizon.Z);
+            //                        cmd.Parameters.AddWithValue("horizon_i", wl.horizon.W);
+            //                        cmd.Parameters.AddWithValue("haze_horizon", wl.hazeHorizon);
+            //                        cmd.Parameters.AddWithValue("blue_density_r", wl.blueDensity.X);
+            //                        cmd.Parameters.AddWithValue("blue_density_g", wl.blueDensity.Y);
+            //                        cmd.Parameters.AddWithValue("blue_density_b", wl.blueDensity.Z);
+            //                        cmd.Parameters.AddWithValue("blue_density_i", wl.blueDensity.W);
+            //                        cmd.Parameters.AddWithValue("haze_density", wl.hazeDensity);
+            //                        cmd.Parameters.AddWithValue("density_multiplier", wl.densityMultiplier);
+            //                        cmd.Parameters.AddWithValue("distance_multiplier", wl.distanceMultiplier);
+            //                        cmd.Parameters.AddWithValue("max_altitude", wl.maxAltitude);
+            //                        cmd.Parameters.AddWithValue("sun_moon_color_r", wl.sunMoonColor.X);
+            //                        cmd.Parameters.AddWithValue("sun_moon_color_g", wl.sunMoonColor.Y);
+            //                        cmd.Parameters.AddWithValue("sun_moon_color_b", wl.sunMoonColor.Z);
+            //                        cmd.Parameters.AddWithValue("sun_moon_color_i", wl.sunMoonColor.W);
+            //                        cmd.Parameters.AddWithValue("sun_moon_position", wl.sunMoonPosition);
+            //                        cmd.Parameters.AddWithValue("ambient_r", wl.ambient.X);
+            //                        cmd.Parameters.AddWithValue("ambient_g", wl.ambient.Y);
+            //                        cmd.Parameters.AddWithValue("ambient_b", wl.ambient.Z);
+            //                        cmd.Parameters.AddWithValue("ambient_i", wl.ambient.W);
+            //                        cmd.Parameters.AddWithValue("east_angle", wl.eastAngle);
+            //                        cmd.Parameters.AddWithValue("sun_glow_focus", wl.sunGlowFocus);
+            //                        cmd.Parameters.AddWithValue("sun_glow_size", wl.sunGlowSize);
+            //                        cmd.Parameters.AddWithValue("scene_gamma", wl.sceneGamma);
+            //                        cmd.Parameters.AddWithValue("star_brightness", wl.starBrightness);
+            //                        cmd.Parameters.AddWithValue("cloud_color_r", wl.cloudColor.X);
+            //                        cmd.Parameters.AddWithValue("cloud_color_g", wl.cloudColor.Y);
+            //                        cmd.Parameters.AddWithValue("cloud_color_b", wl.cloudColor.Z);
+            //                        cmd.Parameters.AddWithValue("cloud_color_i", wl.cloudColor.W);
+            //                        cmd.Parameters.AddWithValue("cloud_x", wl.cloudXYDensity.X);
+            //                        cmd.Parameters.AddWithValue("cloud_y", wl.cloudXYDensity.Y);
+            //                        cmd.Parameters.AddWithValue("cloud_density", wl.cloudXYDensity.Z);
+            //                        cmd.Parameters.AddWithValue("cloud_coverage", wl.cloudCoverage);
+            //                        cmd.Parameters.AddWithValue("cloud_scale", wl.cloudScale);
+            //                        cmd.Parameters.AddWithValue("cloud_detail_x", wl.cloudDetailXYDensity.X);
+            //                        cmd.Parameters.AddWithValue("cloud_detail_y", wl.cloudDetailXYDensity.Y);
+            //                        cmd.Parameters.AddWithValue("cloud_detail_density", wl.cloudDetailXYDensity.Z);
+            //                        cmd.Parameters.AddWithValue("cloud_scroll_x", wl.cloudScrollX);
+            //                        cmd.Parameters.AddWithValue("cloud_scroll_x_lock", wl.cloudScrollXLock);
+            //                        cmd.Parameters.AddWithValue("cloud_scroll_y", wl.cloudScrollY);
+            //                        cmd.Parameters.AddWithValue("cloud_scroll_y_lock", wl.cloudScrollYLock);
+            //                        cmd.Parameters.AddWithValue("draw_classic_clouds", wl.drawClassicClouds);
+
+            //                        cmd.ExecuteNonQuery();
+            //                    }
+            //                }
+            //            }
+            #endregion
        }
        /// <summary>
        /// Loads the settings of a region.
@@ -772,7 +1252,7 @@ VALUES
 ,[elevation_1_ne] = @elevation_1_ne ,[elevation_2_ne] = @elevation_2_ne ,[elevation_1_se] = @elevation_1_se ,[elevation_2_se] = @elevation_2_se 
 ,[elevation_1_sw] = @elevation_1_sw ,[elevation_2_sw] = @elevation_2_sw ,[water_height] = @water_height ,[terrain_raise_limit] = @terrain_raise_limit 
 ,[terrain_lower_limit] = @terrain_lower_limit ,[use_estate_sun] = @use_estate_sun ,[fixed_sun] = @fixed_sun ,[sun_position] = @sun_position 
-,[covenant] = @covenant , [sunvectorx] = @sunvectorx, [sunvectory] = @sunvectory, [sunvectorz] = @sunvectorz,  [Sandbox] = @Sandbox, [loaded_creation_datetime] = @loaded_creation_datetime, [loaded_creation_id] = @loaded_creation_id
+,[covenant] = @covenant ,[covenant_datetime] = @covenant_datetime, [sunvectorx] = @sunvectorx, [sunvectory] = @sunvectory, [sunvectorz] = @sunvectorz,  [Sandbox] = @Sandbox, [loaded_creation_datetime] = @loaded_creation_datetime, [loaded_creation_id] = @loaded_creation_id
 WHERE [regionUUID] = @regionUUID";

                using (SqlConnection conn = new SqlConnection(m_connectionString))
@@ -827,14 +1307,14 @@ VALUES
                                [block_show_in_search],[agent_limit],[object_bonus],[maturity],[disable_scripts],[disable_collisions],[disable_physics],
                                [terrain_texture_1],[terrain_texture_2],[terrain_texture_3],[terrain_texture_4],[elevation_1_nw],[elevation_2_nw],[elevation_1_ne],
                                [elevation_2_ne],[elevation_1_se],[elevation_2_se],[elevation_1_sw],[elevation_2_sw],[water_height],[terrain_raise_limit],
-                                [terrain_lower_limit],[use_estate_sun],[fixed_sun],[sun_position],[covenant],[sunvectorx], [sunvectory], [sunvectorz],[Sandbox], [loaded_creation_datetime], [loaded_creation_id]
+                                [terrain_lower_limit],[use_estate_sun],[fixed_sun],[sun_position],[covenant],[covenant_datetime],[sunvectorx], [sunvectory], [sunvectorz],[Sandbox], [loaded_creation_datetime], [loaded_creation_id]
 ) 
                            VALUES
                                (@regionUUID,@block_terraform,@block_fly,@allow_damage,@restrict_pushing,@allow_land_resell,@allow_land_join_divide,
                                @block_show_in_search,@agent_limit,@object_bonus,@maturity,@disable_scripts,@disable_collisions,@disable_physics,
                                @terrain_texture_1,@terrain_texture_2,@terrain_texture_3,@terrain_texture_4,@elevation_1_nw,@elevation_2_nw,@elevation_1_ne,
                                @elevation_2_ne,@elevation_1_se,@elevation_2_se,@elevation_1_sw,@elevation_2_sw,@water_height,@terrain_raise_limit,
-                                @terrain_lower_limit,@use_estate_sun,@fixed_sun,@sun_position,@covenant,@sunvectorx,@sunvectory, @sunvectorz, @Sandbox, @loaded_creation_datetime, @loaded_creation_id)";
+                                @terrain_lower_limit,@use_estate_sun,@fixed_sun,@sun_position,@covenant, @covenant_datetime, @sunvectorx,@sunvectory, @sunvectorz, @Sandbox, @loaded_creation_datetime, @loaded_creation_id)";

            using (SqlConnection conn = new SqlConnection(m_connectionString))
            using (SqlCommand cmd = new SqlCommand(sql, conn))
@@ -896,7 +1376,7 @@ VALUES
                                                 Convert.ToSingle(row["sunvectorz"])
                                                 );
            newSettings.Covenant = new UUID((Guid)row["covenant"]);
-
+            newSettings.CovenantChangedDateTime = Convert.ToInt32(row["covenant_datetime"]);
            newSettings.LoadedCreationDateTime = Convert.ToInt32(row["loaded_creation_datetime"]);

            if (row["loaded_creation_id"] is DBNull)
@@ -956,7 +1436,6 @@ VALUES
            newData.SnapshotID = new UUID((Guid)row["SnapshotUUID"]);

            newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]);
-            newData.Dwell = Convert.ToInt32(row["Dwell"]);

            try
            {
@@ -974,7 +1453,7 @@ VALUES
                _Log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name);
            }

-            newData.ParcelAccessList = new List<ParcelManager.ParcelAccessEntry>();
+            newData.ParcelAccessList = new List<LandAccessEntry>();

            return newData;
        }
@@ -984,12 +1463,12 @@ VALUES
        /// </summary>
        /// <param name="row">datarecord with landaccess data</param>
        /// <returns></returns>
-        private static ParcelManager.ParcelAccessEntry BuildLandAccessData(IDataRecord row)
+        private static LandAccessEntry BuildLandAccessData(IDataRecord row)
        {
-            ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
+            LandAccessEntry entry = new LandAccessEntry();
            entry.AgentID = new UUID((Guid)row["AccessUUID"]);
            entry.Flags = (AccessList)Convert.ToInt32(row["Flags"]);
-            entry.Time = new DateTime();
+            entry.Expires = 0;
            return entry;
        }

@@ -1017,7 +1496,7 @@ VALUES
            prim.SitName = (string)primRow["SitName"];
            prim.TouchName = (string)primRow["TouchName"];
            // permissions
-            prim.ObjectFlags = Convert.ToUInt32(primRow["ObjectFlags"]);
+            prim.Flags = (PrimFlags)Convert.ToUInt32(primRow["ObjectFlags"]);
            prim.CreatorID = new UUID((Guid)primRow["CreatorID"]);
            prim.OwnerID = new UUID((Guid)primRow["OwnerID"]);
            prim.GroupID = new UUID((Guid)primRow["GroupID"]);
@@ -1128,6 +1607,9 @@ VALUES
                prim.PassTouches = true;
            prim.LinkNum = Convert.ToInt32(primRow["LinkNumber"]);

+            if (!(primRow["MediaURL"] is System.DBNull))
+                prim.MediaUrl = (string)primRow["MediaURL"];
+
            return prim;
        }

@@ -1141,9 +1623,9 @@ VALUES
            PrimitiveBaseShape baseShape = new PrimitiveBaseShape();

            baseShape.Scale = new Vector3(
-                        Convert.ToSingle(shapeRow["ScaleX"]),
-                        Convert.ToSingle(shapeRow["ScaleY"]),
-                        Convert.ToSingle(shapeRow["ScaleZ"]));
+                        (float)Convert.ToDouble(shapeRow["ScaleX"]),
+                        (float)Convert.ToDouble(shapeRow["ScaleY"]),
+                        (float)Convert.ToDouble(shapeRow["ScaleZ"]));

            // paths
            baseShape.PCode = Convert.ToByte(shapeRow["PCode"]);
@@ -1180,6 +1662,12 @@ VALUES
            {
            }

+            if (!(shapeRow["Media"] is System.DBNull))
+            {
+                baseShape.Media = PrimitiveBaseShape.MediaList.FromXml((string)shapeRow["Media"]);
+            }
+
+
            return baseShape;
        }

@@ -1301,6 +1789,7 @@ VALUES
            parameters.Add(_Database.CreateParameter("sunvectory", settings.SunVector.Y));
            parameters.Add(_Database.CreateParameter("sunvectorz", settings.SunVector.Z));
            parameters.Add(_Database.CreateParameter("covenant", settings.Covenant));
+            parameters.Add(_Database.CreateParameter("covenant_datetime", settings.CovenantChangedDateTime));
            parameters.Add(_Database.CreateParameter("Loaded_Creation_DateTime", settings.LoadedCreationDateTime));
            parameters.Add(_Database.CreateParameter("Loaded_Creation_ID", settings.LoadedCreationID));

@@ -1353,7 +1842,6 @@ VALUES
            parameters.Add(_Database.CreateParameter("UserLookAtZ", land.UserLookAt.Z));
            parameters.Add(_Database.CreateParameter("AuthBuyerID", land.AuthBuyerID));
            parameters.Add(_Database.CreateParameter("OtherCleanTime", land.OtherCleanTime));
-            parameters.Add(_Database.CreateParameter("Dwell", land.Dwell));

            return parameters.ToArray();
        }
@@ -1364,7 +1852,7 @@ VALUES
        /// <param name="parcelAccessEntry">parcel access entry.</param>
        /// <param name="parcelID">parcel ID.</param>
        /// <returns></returns>
-        private SqlParameter[] CreateLandAccessParameters(ParcelManager.ParcelAccessEntry parcelAccessEntry, UUID parcelID)
+        private SqlParameter[] CreateLandAccessParameters(LandAccessEntry parcelAccessEntry, UUID parcelID)
        {
            List<SqlParameter> parameters = new List<SqlParameter>();

@@ -1402,7 +1890,7 @@ VALUES
            parameters.Add(_Database.CreateParameter("SitName", prim.SitName));
            parameters.Add(_Database.CreateParameter("TouchName", prim.TouchName));
            // permissions
-            parameters.Add(_Database.CreateParameter("ObjectFlags", prim.ObjectFlags));
+            parameters.Add(_Database.CreateParameter("ObjectFlags", (uint)prim.Flags));
            parameters.Add(_Database.CreateParameter("CreatorID", prim.CreatorID));
            parameters.Add(_Database.CreateParameter("OwnerID", prim.OwnerID));
            parameters.Add(_Database.CreateParameter("GroupID", prim.GroupID));
@@ -1510,6 +1998,7 @@ VALUES
            else
                parameters.Add(_Database.CreateParameter("PassTouches", 0));
            parameters.Add(_Database.CreateParameter("LinkNumber", prim.LinkNum));
+            parameters.Add(_Database.CreateParameter("MediaURL", prim.MediaUrl));

            return parameters.ToArray();
        }
@@ -1558,6 +2047,16 @@ VALUES
            parameters.Add(_Database.CreateParameter("ExtraParams", s.ExtraParams));
            parameters.Add(_Database.CreateParameter("State", s.State));

+            if (null == s.Media)
+            {
+                parameters.Add(_Database.CreateParameter("Media", DBNull.Value));
+            }
+            else
+            {
+                parameters.Add(_Database.CreateParameter("Media", s.Media.ToXml()));
+            }
+
+
            return parameters.ToArray();
        }

--- a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
@@ -218,25 +218,34 @@ namespace OpenSim.Data.MSSQL
            if (words.Length > 2)
                return new UserAccountData[0];

+            string sql = "";
+
            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
            using (SqlCommand cmd = new SqlCommand())
            {
                if (words.Length == 1)
                {
-                    cmd.CommandText = String.Format("select * from {0} where ([ScopeID]=@ScopeID or [ScopeID]='00000000-0000-0000-0000-000000000000') and ([FirstName] like @search or [LastName] like @search)", m_Realm);
+                    sql = String.Format("select * from {0} where ([ScopeID]=@ScopeID or [ScopeID]='00000000-0000-0000-0000-000000000000') and ([FirstName] like @search or [LastName] like @search)", m_Realm);
                    cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));
-                     cmd.Parameters.Add(m_database.CreateParameter("@search", "%" + words[0] + "%"));
+                    cmd.Parameters.Add(m_database.CreateParameter("@search", "%" + words[0] + "%"));
                }
                else
                {
-                    cmd.CommandText = String.Format("select * from {0} where ([ScopeID]=@ScopeID or [ScopeID]='00000000-0000-0000-0000-000000000000') and ([FirstName] like @searchFirst or [LastName] like @searchLast)", m_Realm);
-                     cmd.Parameters.Add(m_database.CreateParameter("@searchFirst", "%" + words[0] + "%"));
-                     cmd.Parameters.Add(m_database.CreateParameter("@searchLast", "%" + words[1] + "%"));
-                     cmd.Parameters.Add(m_database.CreateParameter("@ScopeID", scopeID.ToString()));
+                    sql = String.Format("select * from {0} where ([ScopeID]=@ScopeID or [ScopeID]='00000000-0000-0000-0000-000000000000') and ([FirstName] like @searchFirst or [LastName] like @searchLast)", m_Realm);
+                    cmd.Parameters.Add(m_database.CreateParameter("@searchFirst", "%" + words[0] + "%"));
+                    cmd.Parameters.Add(m_database.CreateParameter("@searchLast", "%" + words[1] + "%"));
+                    cmd.Parameters.Add(m_database.CreateParameter("@ScopeID", scopeID.ToString()));
                }
-
+                cmd.Connection = conn;
+                cmd.CommandText = sql;
+                conn.Open();
                return DoQuery(cmd);
            }
        }
+
+        public UserAccountData[] GetUsersWhere(UUID scopeID, string where)
+        {
+            return null;
+        }
    }
 }
--- a/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs
@@ -66,11 +66,18 @@ namespace OpenSim.Data.MSSQL

        public bool StoreFolder(XInventoryFolder folder)
        {
+            if (folder.folderName.Length > 64)
+                folder.folderName = folder.folderName.Substring(0, 64);
            return m_Folders.Store(folder);
        }

        public bool StoreItem(XInventoryItem item)
        {
+            if (item.inventoryName.Length > 64)
+                item.inventoryName = item.inventoryName.Substring(0, 64);
+            if (item.inventoryDescription.Length > 128)
+                item.inventoryDescription = item.inventoryDescription.Substring(0, 128);
+
            return m_Items.Store(item);
        }

@@ -78,12 +85,19 @@ namespace OpenSim.Data.MSSQL
        {
            return m_Folders.Delete(field, val);
        }
+        public bool DeleteFolders(string[] fields, string[] vals)
+        {
+            return m_Folders.Delete(fields, vals);
+        }

        public bool DeleteItems(string field, string val)
        {
            return m_Items.Delete(field, val);
        }
-
+        public bool DeleteItems(string[] fields, string[] vals)
+        {
+            return m_Items.Delete(fields, vals);
+        }
        public bool MoveItem(string id, string newParent)
        {
            return m_Items.MoveItem(id, newParent);
@@ -162,5 +176,27 @@ namespace OpenSim.Data.MSSQL

            }
        }
+        public override bool Store(XInventoryItem item)
+        {
+            if (!base.Store(item))
+                return false;
+            string sql = "update inventoryfolders set version=version+1 where folderID = @folderID";
+            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            {
+                conn.Open();
+
+                    cmd.Parameters.AddWithValue("@folderID", item.parentFolderID.ToString());
+                    try
+                    {
+                        cmd.ExecuteNonQuery();
+                    }
+                    catch (Exception)
+                    {
+                        return false;
+                    }                
+            }
+            return true;
+        }
    }
 }
--- a/OpenSim/Data/MSSQL/Resources/AuthStore.migrations
+++ b/OpenSim/Data/MSSQL/Resources/AuthStore.migrations
@@ -22,7 +22,11 @@ COMMIT

 BEGIN TRANSACTION

-INSERT INTO auth (UUID, passwordHash, passwordSalt, webLoginKey, accountType) SELECT [UUID] AS UUID, [passwordHash] AS passwordHash, [passwordSalt] AS passwordSalt, [webLoginKey] AS webLoginKey, 'UserAccount' as [accountType] FROM users;
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[users]') AND type in (N'U'))
+	INSERT INTO auth (UUID, passwordHash, passwordSalt, webLoginKey, accountType) SELECT [UUID] AS UUID, [passwordHash] AS passwordHash, [passwordSalt] AS passwordSalt, [webLoginKey] AS webLoginKey, 'UserAccount' as [accountType] FROM users;
+
+COMMIT
+
+


-COMMIT
--- a/OpenSim/Data/MSSQL/Resources/Avatar.migrations
+++ b/OpenSim/Data/MSSQL/Resources/Avatar.migrations
@@ -13,5 +13,52 @@ PRIMARY KEY CLUSTERED
 ) ON [PRIMARY]


+COMMIT
+
+:VERSION 2
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_Avatars
+	(
+	PrincipalID uniqueidentifier NOT NULL,
+	[Name] varchar(32) NOT NULL, 
+	Value text NOT NULL DEFAULT '',
+	)  ON [PRIMARY]
+	 TEXTIMAGE_ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.Avatars)
+	 EXEC('INSERT INTO dbo.Tmp_Avatars (PrincipalID, Name, Value)
+		SELECT PrincipalID, CONVERT(text, Name), Value FROM dbo.Avatars WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.Avatars
+
+EXECUTE sp_rename N'dbo.Tmp_Avatars', N'Avatars', 'OBJECT' 
+
+COMMIT
+
+:VERSION 3
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_Avatars
+	(
+	PrincipalID uniqueidentifier NOT NULL,
+	[Name] varchar(32) NOT NULL, 
+	Value text NOT NULL DEFAULT '',
+	PRIMARY KEY CLUSTERED 
+(
+	[PrincipalID] ASC, [Name] ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
+)  ON [PRIMARY]
+	 TEXTIMAGE_ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.Avatars)
+	 EXEC('INSERT INTO dbo.Tmp_Avatars (PrincipalID, Name, Value)
+		SELECT PrincipalID, CONVERT(text, Name), Value FROM dbo.Avatars WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.Avatars
+
+EXECUTE sp_rename N'dbo.Tmp_Avatars', N'Avatars', 'OBJECT' 
+COMMIT

-COMMIT
--- a/OpenSim/Data/MSSQL/Resources/FriendsStore.migrations
+++ b/OpenSim/Data/MSSQL/Resources/FriendsStore.migrations
@@ -15,6 +15,36 @@ COMMIT

 BEGIN TRANSACTION

-INSERT INTO Friends (PrincipalID, Friend, Flags, Offered) SELECT [ownerID], [friendID], [friendPerms], 0 FROM userfriends;
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[userfriends]') AND type in (N'U'))
+INSERT INTO Friends (PrincipalID, Friend, Flags, Offered) 
+SELECT [ownerID], [friendID], [friendPerms], 0 FROM userfriends;
+
+COMMIT
+
+:VERSION 3 
+
+BEGIN TRANSACTION
+
+CREATE TABLE [Tmp_Friends]
+	([PrincipalID] varchar(255) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', 
+[Friend] varchar(255) NOT NULL, 
+[Flags] char(16) NOT NULL DEFAULT '0',
+[Offered] varchar(32) NOT NULL DEFAULT 0) 
+ON [PRIMARY]
+
+
+IF EXISTS(SELECT * FROM dbo.Friends)
+	 EXEC('INSERT INTO dbo.Tmp_Friends (PrincipalID, Friend, Flags, Offered)
+		SELECT CONVERT(varchar(255),PrincipalID), Friend, Flags, Offered FROM dbo.Friends WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.Friends
+
+EXECUTE sp_rename N'dbo.Tmp_Friends', N'Friends', 'OBJECT' 
+
+ALTER TABLE dbo.Friends ADD 
+	PRIMARY KEY CLUSTERED 
+(
+	[PrincipalID] ASC, [Friend] ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]

 COMMIT
--- a/OpenSim/Data/MSSQL/Resources/GridStore.migrations
+++ b/OpenSim/Data/MSSQL/Resources/GridStore.migrations
@@ -222,4 +222,17 @@ ALTER TABLE [regions] ADD [Token] varchar(255) NOT NULL DEFAULT 0;

 COMMIT

+:VERSION 8

+BEGIN TRANSACTION
+ALTER TABLE regions ALTER COLUMN regionName VarChar(128) 
+
+DROP INDEX IX_regions_name ON dbo.regions
+ALTER TABLE regions ALTER COLUMN regionName VarChar(128) null
+
+CREATE NONCLUSTERED INDEX IX_regions_name ON dbo.regions
+	(
+	regionName
+	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
--- a/OpenSim/Data/MSSQL/Resources/GridUserStore.migrations
+++ b/OpenSim/Data/MSSQL/Resources/GridUserStore.migrations
@@ -0,0 +1,65 @@
+:VERSION 1         # -------------------------- 
+
+BEGIN TRANSACTION
+
+CREATE TABLE "GridUser" (
+    "UserID" VARCHAR(255) NOT NULL,
+    "HomeRegionID" CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    "HomePosition" CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    "HomeLookAt" CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    "LastRegionID" CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    "LastPosition" CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    "LastLookAt" CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    "Online" CHAR(5) NOT NULL DEFAULT 'false',
+    "Login" CHAR(16) NOT NULL DEFAULT '0',
+    "Logout" CHAR(16) NOT NULL DEFAULT '0',
+    PRIMARY KEY  ("UserID")
+) 
+
+COMMIT
+
+:VERSION 2         # -------------------------- 
+
+BEGIN TRANSACTION
+
+CREATE TABLE [GridUser_tmp] (
+    [UserID] VARCHAR(255) NOT NULL,
+    [HomeRegionID] uniqueidentifier NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    [HomePosition] CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    [HomeLookAt] CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    [LastRegionID] uniqueidentifier NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    [LastPosition] CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    [LastLookAt] CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    [Online] CHAR(5) NOT NULL DEFAULT 'false',
+    [Login] CHAR(16) NOT NULL DEFAULT '0',
+    [Logout] CHAR(16) NOT NULL DEFAULT '0',
+    
+	  PRIMARY KEY CLUSTERED
+		(
+			[UserID] ASC
+		)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
+	) ON [PRIMARY]
+
+COMMIT
+
+IF EXISTS(SELECT * FROM dbo.GridUser)
+	 EXEC('INSERT INTO dbo.GridUser_tmp ([UserID]
+           ,[HomeRegionID]
+           ,[HomePosition]
+           ,[HomeLookAt]
+           ,[LastRegionID]
+           ,[LastPosition]
+           ,[LastLookAt]
+           ,[Online]
+           ,[Login]
+           ,[Logout])
+		SELECT CONVERT(varchar(36), [HomeRegionID]), [HomePosition] ,[HomeLookAt] , CONVERT(varchar(36),[LastRegionID])
+      ,[LastPosition]
+      ,[LastLookAt]
+      ,[Online]
+      ,[Login]
+      ,[Logout] FROM dbo.GridUser WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.GridUser
+
+EXECUTE sp_rename N'dbo.GridUser_tmp', N'GridUser', 'OBJECT' 
--- a/OpenSim/Data/MSSQL/Resources/InventoryStore.migrations
+++ b/OpenSim/Data/MSSQL/Resources/InventoryStore.migrations
@@ -238,7 +238,42 @@ alter table inventoryitems

 COMMIT	
   
- 
+:VERSION 8

+ALTER TABLE inventoryitems
+ADD CONSTRAINT DF_inventoryitems_creatorID 
+DEFAULT '00000000-0000-0000-0000-000000000000' FOR creatorID
+   
+:GO

+:VERSION 9

+BEGIN TRANSACTION
+
+# CreatorID goes up to VARCHAR(255)
+
+exec sp_rename 'inventoryitems.CreatorID', 'cr_old', 'COLUMN'
+
+:GO
+
+alter table inventoryitems
+   add creatorID varchar(255) NULL
+   
+:GO   
+   
+update inventoryitems set creatorID = cr_old
+
+alter table inventoryitems
+drop CONSTRAINT DF_inventoryitems_creatorID
+:GO   
+
+alter table inventoryitems
+   drop column cr_old
+   :GO   
+COMMIT	
+
+ALTER TABLE inventoryitems
+ADD CONSTRAINT DF_inventoryitems_creatorID 
+DEFAULT '00000000-0000-0000-0000-000000000000' FOR creatorID
+   
+:GO
--- a/OpenSim/Data/MSSQL/Resources/OpenSim.Data.MSSQL.addin.xml
+++ b/OpenSim/Data/MSSQL/Resources/OpenSim.Data.MSSQL.addin.xml
@@ -1,23 +0,0 @@
-<Addin id="OpenSim.Data.MSSQL" version="0.1">
-    <Runtime>
-        <Import assembly="OpenSim.Data.MSSQL.dll"/>
-    </Runtime>
-    <Dependencies>
-        <Addin id="OpenSim.Data" version="0.5" />
-    </Dependencies>
-    <Extension path = "/OpenSim/GridData">
-        <Plugin id="MSSQLGridData" provider="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLGridData" />
-    </Extension>
-    <Extension path = "/OpenSim/LogData">
-        <Plugin id="MSSQLLogData" provider="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLLogData" />
-    </Extension>
-    <Extension path = "/OpenSim/AssetData">
-        <Plugin id="MSSQLAssetData" provider="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLAssetData" />
-    </Extension>
-    <Extension path = "/OpenSim/InventoryData">
-        <Plugin id="MSSQLInventoryData" provider="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLInventoryData" />
-    </Extension>
-    <Extension path = "/OpenSim/UserData">
-        <Plugin id="MSSQLUserData" provider="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLUserData" />
-    </Extension>
-</Addin>
--- a/OpenSim/Data/MSSQL/Resources/Presence.migrations
+++ b/OpenSim/Data/MSSQL/Resources/Presence.migrations
@@ -7,14 +7,7 @@ CREATE TABLE [Presence] (
 [RegionID] uniqueidentifier NOT NULL, 
 [SessionID] uniqueidentifier NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
 [SecureSessionID] uniqueidentifier NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-[Online] char(5) NOT NULL DEFAULT 'false',
-[Login] char(16) NOT NULL DEFAULT '0',
-[Logout] char(16) NOT NULL DEFAULT '0',
-[Position] char(64) NOT NULL DEFAULT '<0,0,0>',
-[LookAt] char(64) NOT NULL DEFAULT '<0,0,0>',
-[HomeRegionID] uniqueidentifier NOT NULL,
-[HomePosition] CHAR(64) NOT NULL DEFAULT '<0,0,0>',
-[HomeLookAt] CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+
 )
 ON [PRIMARY]

@@ -27,4 +20,12 @@ BEGIN TRANSACTION
 CREATE UNIQUE INDEX SessionID ON Presence(SessionID);
 CREATE INDEX UserID ON Presence(UserID);

+COMMIT
+
+:VERSION 2
+
+BEGIN TRANSACTION
+
+ALTER TABLE Presence ADD LastSeen DateTime
+
 COMMIT
--- a/OpenSim/Data/MSSQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MSSQL/Resources/RegionStore.migrations
@@ -1,4 +1,3 @@
-
 :VERSION 1

 CREATE TABLE [dbo].[prims](
@@ -925,5 +924,130 @@ ALTER TABLE regionsettings ADD loaded_creation_datetime int NOT NULL default 0

 COMMIT

+:VERSION 24

+BEGIN TRANSACTION

+ALTER TABLE prims ADD  MediaURL varchar(255)
+ALTER TABLE primshapes ADD Media TEXT NULL
+
+COMMIT
+
+:VERSION 25
+
+BEGIN TRANSACTION
+CREATE TABLE "regionwindlight" (
+  "region_id" varchar(36) NOT NULL DEFAULT '000000-0000-0000-0000-000000000000',
+  "water_color_r" [float] NOT NULL DEFAULT '4.000000',
+  "water_color_g" [float] NOT NULL DEFAULT '38.000000',
+  "water_color_b" [float] NOT NULL DEFAULT '64.000000',
+  "water_fog_density_exponent" [float] NOT NULL DEFAULT '4.0',
+  "underwater_fog_modifier" [float] NOT NULL DEFAULT '0.25',
+  "reflection_wavelet_scale_1" [float] NOT NULL DEFAULT '2.0',
+  "reflection_wavelet_scale_2" [float] NOT NULL DEFAULT '2.0',
+  "reflection_wavelet_scale_3" [float] NOT NULL DEFAULT '2.0',
+  "fresnel_scale" [float] NOT NULL DEFAULT '0.40',
+  "fresnel_offset" [float] NOT NULL DEFAULT '0.50',
+  "refract_scale_above" [float] NOT NULL DEFAULT '0.03',
+  "refract_scale_below" [float] NOT NULL DEFAULT '0.20',
+  "blur_multiplier" [float] NOT NULL DEFAULT '0.040',
+  "big_wave_direction_x" [float] NOT NULL DEFAULT '1.05',
+  "big_wave_direction_y" [float] NOT NULL DEFAULT '-0.42',
+  "little_wave_direction_x" [float] NOT NULL DEFAULT '1.11',
+  "little_wave_direction_y" [float] NOT NULL DEFAULT '-1.16',
+  "normal_map_texture" varchar(36) NOT NULL DEFAULT '822ded49-9a6c-f61c-cb89-6df54f42cdf4',
+  "horizon_r" [float] NOT NULL DEFAULT '0.25',
+  "horizon_g" [float] NOT NULL DEFAULT '0.25',
+  "horizon_b" [float] NOT NULL DEFAULT '0.32',
+  "horizon_i" [float] NOT NULL DEFAULT '0.32',
+  "haze_horizon" [float] NOT NULL DEFAULT '0.19',
+  "blue_density_r" [float] NOT NULL DEFAULT '0.12',
+  "blue_density_g" [float] NOT NULL DEFAULT '0.22',
+  "blue_density_b" [float] NOT NULL DEFAULT '0.38',
+  "blue_density_i" [float] NOT NULL DEFAULT '0.38',
+  "haze_density" [float] NOT NULL DEFAULT '0.70',
+  "density_multiplier" [float] NOT NULL DEFAULT '0.18',
+  "distance_multiplier" [float] NOT NULL DEFAULT '0.8',
+  "max_altitude" int NOT NULL DEFAULT '1605',
+  "sun_moon_color_r" [float] NOT NULL DEFAULT '0.24',
+  "sun_moon_color_g" [float] NOT NULL DEFAULT '0.26',
+  "sun_moon_color_b" [float] NOT NULL DEFAULT '0.30',
+  "sun_moon_color_i" [float] NOT NULL DEFAULT '0.30',
+  "sun_moon_position" [float] NOT NULL DEFAULT '0.317',
+  "ambient_r" [float] NOT NULL DEFAULT '0.35',
+  "ambient_g" [float] NOT NULL DEFAULT '0.35',
+  "ambient_b" [float] NOT NULL DEFAULT '0.35',
+  "ambient_i" [float] NOT NULL DEFAULT '0.35',
+  "east_angle" [float] NOT NULL DEFAULT '0.00',
+  "sun_glow_focus" [float] NOT NULL DEFAULT '0.10',
+  "sun_glow_size" [float] NOT NULL DEFAULT '1.75',
+  "scene_gamma" [float] NOT NULL DEFAULT '1.00',
+  "star_brightness" [float] NOT NULL DEFAULT '0.00',
+  "cloud_color_r" [float] NOT NULL DEFAULT '0.41',
+  "cloud_color_g" [float] NOT NULL DEFAULT '0.41',
+  "cloud_color_b" [float] NOT NULL DEFAULT '0.41',
+  "cloud_color_i" [float] NOT NULL DEFAULT '0.41',
+  "cloud_x" [float] NOT NULL DEFAULT '1.00',
+  "cloud_y" [float] NOT NULL DEFAULT '0.53',
+  "cloud_density" [float] NOT NULL DEFAULT '1.00',
+  "cloud_coverage" [float] NOT NULL DEFAULT '0.27',
+  "cloud_scale" [float] NOT NULL DEFAULT '0.42',
+  "cloud_detail_x" [float] NOT NULL DEFAULT '1.00',
+  "cloud_detail_y" [float] NOT NULL DEFAULT '0.53',
+  "cloud_detail_density" [float] NOT NULL DEFAULT '0.12',
+  "cloud_scroll_x" [float] NOT NULL DEFAULT '0.20',
+  "cloud_scroll_x_lock" tinyint NOT NULL DEFAULT '0',
+  "cloud_scroll_y" [float] NOT NULL DEFAULT '0.01',
+  "cloud_scroll_y_lock" tinyint NOT NULL DEFAULT '0',
+  "draw_classic_clouds" tinyint NOT NULL DEFAULT '1',
+  PRIMARY KEY ("region_id")
+)
+
+COMMIT
+
+:VERSION 26
+
+BEGIN TRANSACTION
+
+ALTER TABLE regionsettings ADD map_tile_ID CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'
+
+COMMIT
+
+:VERSION 27         #---------------------
+
+BEGIN TRANSACTION
+ALTER TABLE land ADD MediaType VARCHAR(32) NOT NULL DEFAULT 'none/none' 
+ALTER TABLE land ADD MediaDescription VARCHAR(255) NOT NULL DEFAULT ''
+ALTER TABLE land ADD MediaSize VARCHAR(16) NOT NULL DEFAULT '0,0'
+ALTER TABLE land ADD MediaLoop bit NOT NULL DEFAULT 0
+ALTER TABLE land ADD ObscureMusic bit NOT NULL DEFAULT 0
+ALTER TABLE land ADD ObscureMedia bit NOT NULL DEFAULT 0
+COMMIT
+
+:VERSION 28         #---------------------
+
+BEGIN TRANSACTION
+
+ALTER TABLE prims 
+ADD CONSTRAINT DF_prims_CreatorID 
+DEFAULT '00000000-0000-0000-0000-000000000000' 
+FOR CreatorID
+
+ALTER TABLE prims  ALTER COLUMN CreatorID uniqueidentifier NOT NULL
+
+ALTER TABLE primitems
+ADD CONSTRAINT DF_primitems_CreatorID 
+DEFAULT '00000000-0000-0000-0000-000000000000' 
+FOR CreatorID
+
+ALTER TABLE primitems ALTER COLUMN CreatorID uniqueidentifier NOT NULL
+
+COMMIT
+
+:VERSION 29         #---------------------
+
+BEGIN TRANSACTION
+
+ALTER TABLE regionsettings ADD covenant_datetime int NOT NULL default 0
+
+COMMIT
--- a/OpenSim/Data/MSSQL/Resources/UserAccount.migrations
+++ b/OpenSim/Data/MSSQL/Resources/UserAccount.migrations
@@ -19,7 +19,7 @@ CREATE TABLE [UserAccounts] (
 :VERSION 2

 BEGIN TRANSACTION
-
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[users]') AND type in (N'U'))
 INSERT INTO UserAccounts (PrincipalID, ScopeID, FirstName, LastName, Email, ServiceURLs, Created) SELECT [UUID] AS PrincipalID, '00000000-0000-0000-0000-000000000000' AS ScopeID, 
 username AS FirstName, 
 lastname AS LastName, 
--- a/Show More
+++ b/Show More