Move SenseRepeaters.Count check inside the SenseRepeatListLock.

No methods in the List class are thread safe in the MS specification/documentation

.gitignore

@@ -26,14 +26,9 @@
 bin/Debug/*.dll
 bin/*.dll.mdb
 bin/*.db
-bin/*.db-journal
 bin/addin-db-*
 bin/*.dll
 bin/OpenSim.vshost.exe.config
-bin/OpenSim.32BitLaunch.vshost.exe.config
-bin/OpenSim.32BitLaunch.log
-UpgradeLog.XML
-_UpgradeReport_Files/
 bin/ScriptEngines/*-*-*-*-*
 bin/ScriptEngines/*.dll
 bin/ScriptEngines/*/*.dll
@@ -46,8 +41,6 @@ bin/Physics*
 bin/Terrain*
 bin/Regions/*
 bin/UserAssets
-bin/assetcache
-bin/maptiles
 bin/estate_settings.xml
 bin/config-include/CenomeCache.ini
 bin/config-include/FlotsamCache.ini
@@ -77,20 +70,4 @@ 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/
+

.nant/local.include

@@ -2,37 +2,13 @@
 <!-- please leave the top comment for us emacs folks -->
 <property name="nunitcmd" value="nunit-console" />
 
-<!-- This target produces a source distribution of OpenSimulator -->
-<!-- TODO: A few parameters still need to be tweaked after running this - need to do this automatically with sed or similar -->
-<target name="distsrc">
+<!-- For safety/laziness sake, we're going to take the approach of deleting known extraneous files here rather than
+     trying to copy across only the essential ones -->
+<property name="distbindir" value="distbin" />
+<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 files generated by runprebuild.sh which had to be run in order to generate the build file for this target-->
-  <delete>
-    <fileset basedir="OpenSim">
-      <include name="**/*.build"/>
-      <include name="**/*.csproj*"/>
-      <include name="**/*.dll.build"/>
-      <include name="**/*.pidb"/>
-      <exclude name="Tools/OpenSim.32BitLaunch/**"/>
-      <exclude name="Tools/Robust.32BitLaunch/**"/>
-      <exclude name="Tools/LaunchSLClient/**"/>
-    </fileset>
-  </delete>
-  <delete>
-    <fileset>
-      <include name="OpenSim.build"/>
-      <include name="OpenSim.sln"/>
-    </fileset>
-  </delete>
-</target>
-
-<property name="distbindir" value="distbin" />
-<!-- This target produces a binary directory called distbin/ in OpenSim/bin which contains everything needed for binary distribution -->
-<!-- For safety/laziness sake, we're going to take the approach of deleting known extraneous files here rather than
-     trying to copy across only the essential ones -->
-<target name="distbin">
   <delete dir="${distbindir}"/>
   <copy todir="${distbindir}">
     <fileset>
@@ -62,8 +38,52 @@
       <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" />
 
@@ -127,34 +147,117 @@
   </exec>
   <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> 
 
-  <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-stress" depends="build, find-nunit">
-  <setenv name="MONO_THREADS_PER_CPU" value="100" />
+<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>
 
-  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.stress">
-    <arg value="./bin/OpenSim.Tests.Stress.dll" />
-  </exec>
+<!--
+    <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.OptionalModules.cov,+[OpenSim.Region.OptionalModules]" />
+      <arg value="/usr/lib/nunit/nunit-console.exe" />
+      <arg value="./bin/OpenSim.Region.OptionalModules.Tests.dll" />
+    </exec>
+    <delete dir="./cov/OpenSim.Region.OptionalModules" />
+    <exec program="monocov">
+      <arg value="--export-html=./cov/OpenSim.Region.OptionalModules ./cov/OpenSim.Region.OptionalModules.cov" />
+    </exec>    
 
-  <fail message="Failures reported in stress tests." unless="${int::parse(testresult.opensim.tests.stress)==0}" /> 
-  <delete dir="%temp%"/>
-</target>
+    <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>     
 
-<target name="test-perf" depends="build, find-nunit">
-  <setenv name="MONO_THREADS_PER_CPU" value="100" />
+    <delete file="C:\NUnitPrimaryTrace.txt" failonerror="false" />
+    <delete file="TestResult.xml" failonerror="false" />
 
-  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.performance">
-    <arg value="./bin/OpenSim.Tests.Performance.dll" />
-  </exec>
-
-  <fail message="Failures reported in performance tests." unless="${int::parse(testresult.opensim.tests.performance)==0}" /> 
-  <delete dir="%temp%"/>
 </target>
 
 <target name="find-nunit">
@@ -167,12 +270,15 @@
     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">
@@ -230,11 +336,6 @@
     <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}" /> 
@@ -244,8 +345,36 @@
  <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.OptionalModules.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" />

BUILDING.txt

@@ -12,27 +12,18 @@ Steps:
 === Building on Linux ===
 
 Prereqs:
- * Mono >= 2.4.3
+ * Mono >= 2.4.2
  * 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 (or xbuild)
+ * nant
  * 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:

CONTRIBUTORS.txt

@@ -1,11 +1,11 @@
-   <<<>>>>The following people have contributed to OpenSim (Thank you 
+The following people have contributed to OpenSim (Thank you 
 for your effort!)
 
 = 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)
+* justincc
 * chi11ken (Genkii)
 * dahlia
 * Melanie Thielker
@@ -14,9 +14,7 @@ people that make the day to day of OpenSim happen.
 * 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. 
@@ -71,7 +69,6 @@ what it is today.
 * CharlieO
 * ChrisDown
 * Chris Yeoh (IBM)
-* controlbreak
 * coyled
 * Daedius
 * Dong Jun Lan (IBM)
@@ -81,18 +78,12 @@ what it is today.
 * dmiles (Daxtron Labs)
 * dslake (Intel)
 * FredoChaplin
-* Garmin Kawaguichi
 * Gerhard
 * Godfrey
 * Grumly57
-* GuduleLapointe
 * Ewe Loon
-* Fernando Oliveira
 * Fly-Man
 * Flyte Xevious
-* Garmin Kawaguichi
-* Gryc Ueusp
-* Hiro Lecker
 * Imaze Rhiano
 * Intimidated
 * Jeremy Bongio (IBM)
@@ -110,8 +101,6 @@ what it is today.
 * lulurun 
 * M.Igarashi
 * maimedleech
-* Mana Janus
-* MarcelEdward
 * Mic Bowman
 * Michelle Argus
 * Michael Cortez (The Flotsam Project, http://osflotsam.org/)
@@ -130,7 +119,6 @@ what it is today.
 * openlifegrid.com
 * Oren Hurvitz (Kitely)
 * otakup0pe
-* Pixel Tomsen
 * ralphos
 * RemedyTomm
 * Revolution
@@ -141,15 +129,9 @@ what it is today.
 * Ruud Lathorp
 * SachaMagne
 * Salahzar Stenvaag
-* satguru p srivastava
 * sempuki
 * SignpostMarv
-* SpotOn3D
-* Stefan_Boom / stoehr
 * Strawberry Fride
-* Talun
-* TechplexEngineer (Blake Bourque)
-* TBG Renfold
 * tglion
 * tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud)
 * tyre
@@ -208,4 +190,3 @@ In addition, we would like to thank:
 * The Mono Project
 * The NANT Developers
 * Microsoft (.NET, MSSQL-Adapters)
-*x

OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs

@@ -30,7 +30,6 @@ 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;
@@ -122,10 +121,9 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
                             Thread.CurrentThread.ManagedThreadId.ToString() +
                             ")");
                 
-                bool changed = m_openSim.PopulateRegionEstateInfo(regionsToLoad[i]);
+                m_openSim.PopulateRegionEstateInfo(regionsToLoad[i]);
                 m_openSim.CreateRegion(regionsToLoad[i], true, out scene);
-                if (changed)
-		  regionsToLoad[i].EstateSettings.Save();
+                regionsToLoad[i].EstateSettings.Save();
                 
                 if (scene != null)
                 {
@@ -154,20 +152,9 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
         /// <returns>True if we're sane, false if we're insane</returns>
         private bool CheckRegionsForSanity(RegionInfo[] regions)
         {
-            if (regions.Length == 0)
+            if (regions.Length <= 1)
                 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++)
@@ -199,5 +186,35 @@ 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);
+                }
+            }
+        }
     }
 }

OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs

@@ -179,7 +179,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     {
                         foreach (string enabledMethod in enabledMethods.Split('|'))
                         {
-                            m_httpServer.AddXmlRPCHandler(enabledMethod, availableMethods[enabledMethod], false);
+                            m_httpServer.AddXmlRPCHandler(enabledMethod, availableMethods[enabledMethod]);
                         }
                     }
                 }
@@ -257,13 +257,17 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             {
                 m_log.Info("[RADMIN]: Request to restart Region.");
 
-                CheckRegionParams(requestData, responseData);
+                CheckStringParameters(requestData, responseData, new string[] {"regionID"});
 
-                Scene rebootedScene = null;
-                GetSceneFromRegionParams(requestData, responseData, out rebootedScene);
+                UUID regionID = new UUID((string) requestData["regionID"]);
+
+                Scene rebootedScene;
 
                 responseData["success"] = false;
                 responseData["accepted"] = true;
+                if (!m_application.SceneManager.TryGetScene(regionID, out rebootedScene))
+                    throw new Exception("region not found");
+
                 responseData["rebooting"] = true;
 
                 IRestartModule restartModule = rebootedScene.RequestModuleInterface<IRestartModule>();
@@ -325,15 +329,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             // }
 
             CheckStringParameters(requestData, responseData, new string[] {"filename", "regionid"});
-            CheckRegionParams(requestData, responseData);
 
-            Scene scene = null;
-            GetSceneFromRegionParams(requestData, responseData, out scene);
-            string file = (string)requestData["filename"];
+            string file = (string) requestData["filename"];
+            UUID regionID = (UUID) (string) requestData["regionid"];
+            m_log.InfoFormat("[RADMIN]: Terrain Loading: {0}", file);
 
             responseData["accepted"] = true;
 
-            LoadHeightmap(file, scene.RegionInfo.RegionID);
+            LoadHeightmap(file, regionID);
 
             responseData["success"] = true;
 
@@ -350,16 +353,18 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 //                m_log.DebugFormat("[RADMIN]: Save Terrain: XmlRpc {0}", request.ToString());
 
             CheckStringParameters(requestData, responseData, new string[] { "filename", "regionid" });
-            CheckRegionParams(requestData, responseData);
-
-            Scene region = null;
-            GetSceneFromRegionParams(requestData, responseData, out region);
 
             string file = (string)requestData["filename"];
+            UUID regionID = (UUID)(string)requestData["regionid"];
             m_log.InfoFormat("[RADMIN]: Terrain Saving: {0}", file);
 
             responseData["accepted"] = true;
 
+            Scene region = null;
+
+            if (!m_application.SceneManager.TryGetScene(regionID, out region))
+                throw new Exception("1: unable to get a scene with that name");
+
             ITerrainModule terrainModule = region.RequestModuleInterface<ITerrainModule>();
             if (null == terrainModule) throw new Exception("terrain module not available");
 
@@ -727,8 +732,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                 responseData["success"] = true;
                 responseData["region_name"] = region.RegionName;
-                responseData["region_id"] = region.RegionID.ToString();
-                responseData["region_uuid"] = region.RegionID.ToString(); //Deprecate July 2012
+                responseData["region_uuid"] = region.RegionID.ToString();
 
                 m_log.Info("[RADMIN]: CreateRegion: request complete");
             }
@@ -770,16 +774,16 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             lock (m_requestLock)
             {
                 CheckStringParameters(requestData, responseData, new string[] {"region_name"});
-                CheckRegionParams(requestData, responseData);
 
                 Scene scene = null;
-                GetSceneFromRegionParams(requestData, responseData, out scene);
+                string regionName = (string) requestData["region_name"];
+                if (!m_application.SceneManager.TryGetScene(regionName, out scene))
+                    throw new Exception(String.Format("region \"{0}\" does not exist", regionName));
 
                 m_application.RemoveRegion(scene, true);
 
                 responseData["success"] = true;
-                responseData["region_name"] = scene.RegionInfo.RegionName;
-                responseData["region_id"] = scene.RegionInfo.RegionID;
+                responseData["region_name"] = regionName;
 
                 m_log.Info("[RADMIN]: DeleteRegion: request complete");
             }
@@ -819,21 +823,44 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
             Hashtable responseData = (Hashtable)response.Value;
             Hashtable requestData = (Hashtable)request.Params[0];
+            Scene scene = null;
 
             lock (m_requestLock)
             {
-                CheckRegionParams(requestData, responseData);
+                if (requestData.ContainsKey("region_id") &&
+                    !String.IsNullOrEmpty((string) requestData["region_id"]))
+                {
+                    // Region specified by UUID
+                    UUID regionID = (UUID) (string) requestData["region_id"];
+                    if (!m_application.SceneManager.TryGetScene(regionID, out scene))
+                        throw new Exception(String.Format("region \"{0}\" does not exist", regionID));
 
-                Scene scene = null;
-                GetSceneFromRegionParams(requestData, responseData, out scene);
+                    m_application.CloseRegion(scene);
 
-                m_application.CloseRegion(scene);
+                    responseData["success"] = true;
+                    responseData["region_id"] = regionID;
 
-                responseData["success"] = true;
-                responseData["region_name"] = scene.RegionInfo.RegionName;
-                responseData["region_id"] = scene.RegionInfo.RegionID;
+                    response.Value = responseData;
+                }
+                else if (
+                    requestData.ContainsKey("region_name")
+                         && !String.IsNullOrEmpty((string) requestData["region_name"]))
+                {
+                    // Region specified by name
 
-                response.Value = responseData;
+                    string regionName = (string) requestData["region_name"];
+                    if (!m_application.SceneManager.TryGetScene(regionName, out scene))
+                        throw new Exception(String.Format("region \"{0}\" does not exist", regionName));
+
+                    m_application.CloseRegion(scene);
+
+                    responseData["success"] = true;
+                    responseData["region_name"] = regionName;
+                }
+                else
+                {
+                    throw new Exception("no region specified");
+                }
 
                 m_log.Info("[RADMIN]: CloseRegion: request complete");
             }
@@ -880,10 +907,12 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
             lock (m_requestLock)
             {
-                CheckRegionParams(requestData, responseData);
+                CheckStringParameters(requestData, responseData, new string[] {"region_name"});
 
                 Scene scene = null;
-                GetSceneFromRegionParams(requestData, responseData, out scene);
+                string regionName = (string) requestData["region_name"];
+                if (!m_application.SceneManager.TryGetScene(regionName, out scene))
+                    throw new Exception(String.Format("region \"{0}\" does not exist", regionName));
 
                 // Modify access
                 scene.RegionInfo.EstateSettings.PublicAccess =
@@ -913,8 +942,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 }
 
                 responseData["success"] = true;
-                responseData["region_name"] = scene.RegionInfo.RegionName;
-                responseData["region_id"] = scene.RegionInfo.RegionID;
+                responseData["region_name"] = regionName;
 
                 m_log.Info("[RADMIN]: ModifyRegion: request complete");
             }
@@ -1310,12 +1338,22 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 try
                 {
                     CheckStringParameters(requestData, responseData, new string[] {"filename"});
-                    CheckRegionParams(requestData, responseData);
-
-                    Scene scene = null;
-                    GetSceneFromRegionParams(requestData, responseData, out scene);
 
                     string filename = (string) requestData["filename"];
+                    Scene scene = null;
+                    if (requestData.Contains("region_uuid"))
+                    {
+                        UUID region_uuid = (UUID) (string) requestData["region_uuid"];
+                        if (!m_application.SceneManager.TryGetScene(region_uuid, out scene))
+                            throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
+                    }
+                    else if (requestData.Contains("region_name"))
+                    {
+                        string region_name = (string) requestData["region_name"];
+                        if (!m_application.SceneManager.TryGetScene(region_name, out scene))
+                            throw new Exception(String.Format("failed to switch to region {0}", region_name));
+                    }
+                    else throw new Exception("neither region_name nor region_uuid given");
                     
                     bool mergeOar = false;
                     bool skipAssets = false;
@@ -1396,12 +1434,22 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             try
             {
                 CheckStringParameters(requestData, responseData, new string[] {"filename"});
-                CheckRegionParams(requestData, responseData);
-
-                Scene scene = null;
-                GetSceneFromRegionParams(requestData, responseData, out scene);
 
                 string filename = (string)requestData["filename"];
+                Scene scene = null;
+                if (requestData.Contains("region_uuid"))
+                {
+                    UUID region_uuid = (UUID) (string) requestData["region_uuid"];
+                    if (!m_application.SceneManager.TryGetScene(region_uuid, out scene))
+                        throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
+                }
+                else if (requestData.Contains("region_name"))
+                {
+                    string region_name = (string) requestData["region_name"];
+                    if (!m_application.SceneManager.TryGetScene(region_name, out scene))
+                        throw new Exception(String.Format("failed to switch to region {0}", region_name));
+                }
+                else throw new Exception("neither region_name nor region_uuid given");
 
                 Dictionary<string, object> options = new Dictionary<string, object>();
 
@@ -1410,9 +1458,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 //    options["version"] = (string)requestData["version"];
                 //}
 
-                if (requestData.Contains("home"))
+                if (requestData.Contains("profile"))
                 {
-                    options["home"] = (string)requestData["home"];
+                    options["profile"] = (string)requestData["profile"];
                 }
 
                 if ((string)requestData["noassets"] == "true")
@@ -1473,12 +1521,25 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 try
                 {
                     CheckStringParameters(requestData, responseData, new string[] {"filename"});
-                    CheckRegionParams(requestData, responseData);
-
-                    Scene scene = null;
-                    GetSceneFromRegionParams(requestData, responseData, out scene);
 
                     string filename = (string) requestData["filename"];
+                    if (requestData.Contains("region_uuid"))
+                    {
+                        UUID region_uuid = (UUID) (string) requestData["region_uuid"];
+                        if (!m_application.SceneManager.TrySetCurrentScene(region_uuid))
+                            throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
+
+                        m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_uuid.ToString());
+                    }
+                    else if (requestData.Contains("region_name"))
+                    {
+                        string region_name = (string) requestData["region_name"];
+                        if (!m_application.SceneManager.TrySetCurrentScene(region_name))
+                            throw new Exception(String.Format("failed to switch to region {0}", region_name));
+
+                        m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_name);
+                    }
+                    else throw new Exception("neither region_name nor region_uuid given");
 
                     responseData["switched"] = true;
 
@@ -1526,12 +1587,23 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             try
             {
                 CheckStringParameters(requestData, responseData, new string[] {"filename"});
-                CheckRegionParams(requestData, responseData);
-
-                Scene scene = null;
-                GetSceneFromRegionParams(requestData, responseData, out scene);
 
                 string filename = (string) requestData["filename"];
+                if (requestData.Contains("region_uuid"))
+                {
+                    UUID region_uuid = (UUID) (string) requestData["region_uuid"];
+                    if (!m_application.SceneManager.TrySetCurrentScene(region_uuid))
+                        throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
+                    m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_uuid.ToString());
+                }
+                else if (requestData.Contains("region_name"))
+                {
+                    string region_name = (string) requestData["region_name"];
+                    if (!m_application.SceneManager.TrySetCurrentScene(region_name))
+                        throw new Exception(String.Format("failed to switch to region {0}", region_name));
+                    m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_name);
+                }
+                else throw new Exception("neither region_name nor region_uuid given");
 
                 responseData["switched"] = true;
 
@@ -1575,15 +1647,33 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             Hashtable responseData = (Hashtable)response.Value;
             Hashtable requestData = (Hashtable)request.Params[0];
 
-            CheckRegionParams(requestData, responseData);
+            responseData["success"] = true;
 
-            Scene scene = null;
-            GetSceneFromRegionParams(requestData, responseData, out scene);
+            if (requestData.Contains("region_uuid"))
+            {
+                UUID region_uuid = (UUID) (string) requestData["region_uuid"];
+                if (!m_application.SceneManager.TrySetCurrentScene(region_uuid))
+                    throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
 
+                m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_uuid.ToString());
+            }
+            else if (requestData.Contains("region_name"))
+            {
+                string region_name = (string) requestData["region_name"];
+                if (!m_application.SceneManager.TrySetCurrentScene(region_name))
+                    throw new Exception(String.Format("failed to switch to region {0}", region_name));
+
+                m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_name);
+            }
+            else
+            {
+                throw new Exception("neither region_name nor region_uuid given");
+            }
+
+            Scene scene = m_application.SceneManager.CurrentScene;
             int health = scene.GetHealth();
             responseData["health"] = health;
 
-            responseData["success"] = true;
             m_log.Info("[RADMIN]: Query XML Administrator Request complete");
         }
 
@@ -1610,11 +1700,24 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
             responseData["success"] = true;
 
-            CheckRegionParams(requestData, responseData);
+            if (requestData.Contains("region_uuid"))
+            {
+                UUID region_uuid = (UUID) (string) requestData["region_uuid"];
+                if (!m_application.SceneManager.TrySetCurrentScene(region_uuid))
+                    throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
+                m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_uuid.ToString());
+            }
+            else if (requestData.Contains("region_name"))
+            {
+                string region_name = (string) requestData["region_name"];
+                if (!m_application.SceneManager.TrySetCurrentScene(region_name))
+                    throw new Exception(String.Format("failed to switch to region {0}", region_name));
 
-            Scene scene = null;
-            GetSceneFromRegionParams(requestData, responseData, out scene);
+                m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_name);
+            }
+            else throw new Exception("neither region_name nor region_uuid given");
 
+            Scene scene = m_application.SceneManager.CurrentScene;
             scene.RegionInfo.EstateSettings.EstateAccess = new UUID[]{};
 
             if (scene.RegionInfo.Persistent)
@@ -1630,17 +1733,32 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             Hashtable responseData = (Hashtable)response.Value;
             Hashtable requestData = (Hashtable)request.Params[0];
 
-            CheckRegionParams(requestData, responseData);
-
-            Scene scene = null;
-            GetSceneFromRegionParams(requestData, responseData, out scene);
+            if (requestData.Contains("region_uuid"))
+            {
+                UUID region_uuid = (UUID) (string) requestData["region_uuid"];
+                if (!m_application.SceneManager.TrySetCurrentScene(region_uuid))
+                    throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
+                m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_uuid.ToString());
+            }
+            else if (requestData.Contains("region_name"))
+            {
+                string region_name = (string) requestData["region_name"];
+                if (!m_application.SceneManager.TrySetCurrentScene(region_name))
+                    throw new Exception(String.Format("failed to switch to region {0}", region_name));
+                m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_name);
+            }
+            else
+            {
+                throw new Exception("neither region_name nor region_uuid given");
+            }
 
             int addedUsers = 0;
 
             if (requestData.Contains("users"))
             {
-                UUID scopeID = scene.RegionInfo.ScopeID;
-                IUserAccountService userService = scene.UserAccountService;
+                UUID scopeID = m_application.SceneManager.CurrentOrFirstScene.RegionInfo.ScopeID;
+                IUserAccountService userService = m_application.SceneManager.CurrentOrFirstScene.UserAccountService;
+                Scene scene = m_application.SceneManager.CurrentScene;
                 Hashtable users = (Hashtable) requestData["users"];
                 List<UUID> uuids = new List<UUID>();
                 foreach (string name in users.Values)
@@ -1679,18 +1797,32 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             Hashtable responseData = (Hashtable)response.Value;
             Hashtable requestData = (Hashtable)request.Params[0];
 
-            CheckRegionParams(requestData, responseData);
+            responseData["success"] = true;
 
-            Scene scene = null;
-            GetSceneFromRegionParams(requestData, responseData, out scene);
+            if (requestData.Contains("region_uuid"))
+            {
+                UUID region_uuid = (UUID) (string) requestData["region_uuid"];
+                if (!m_application.SceneManager.TrySetCurrentScene(region_uuid))
+                    throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
+                m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_uuid.ToString());
+            }
+            else if (requestData.Contains("region_name"))
+            {
+                string region_name = (string) requestData["region_name"];
+                if (!m_application.SceneManager.TrySetCurrentScene(region_name))
+                    throw new Exception(String.Format("failed to switch to region {0}", region_name));
+                m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_name);
+            }
+            else throw new Exception("neither region_name nor region_uuid given");
 
             int removedUsers = 0;
 
             if (requestData.Contains("users"))
             {
-                UUID scopeID = scene.RegionInfo.ScopeID;
-                IUserAccountService userService = scene.UserAccountService;
+                UUID scopeID = m_application.SceneManager.CurrentOrFirstScene.RegionInfo.ScopeID;
+                IUserAccountService userService = m_application.SceneManager.CurrentOrFirstScene.UserAccountService;
                 //UserProfileCacheService ups = m_application.CommunicationsManager.UserProfileCacheService;
+                Scene scene = m_application.SceneManager.CurrentScene;
                 Hashtable users = (Hashtable) requestData["users"];
                 List<UUID> uuids = new List<UUID>();
                 foreach (string name in users.Values)
@@ -1717,7 +1849,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
 
             responseData["removed"] = removedUsers;
-            responseData["success"] = true;
 
             m_log.Info("[RADMIN]: Access List Remove Request complete");
         }
@@ -1729,18 +1860,32 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             Hashtable responseData = (Hashtable)response.Value;
             Hashtable requestData = (Hashtable)request.Params[0];
 
-            CheckRegionParams(requestData, responseData);
+            responseData["success"] = true;
 
-            Scene scene = null;
-            GetSceneFromRegionParams(requestData, responseData, out scene);
+            if (requestData.Contains("region_uuid"))
+            {
+                UUID region_uuid = (UUID) (string) requestData["region_uuid"];
+                if (!m_application.SceneManager.TrySetCurrentScene(region_uuid))
+                    throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
+                m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_uuid.ToString());
+            }
+            else if (requestData.Contains("region_name"))
+            {
+                string region_name = (string) requestData["region_name"];
+                if (!m_application.SceneManager.TrySetCurrentScene(region_name))
+                    throw new Exception(String.Format("failed to switch to region {0}", region_name));
+                m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_name);
+            }
+            else throw new Exception("neither region_name nor region_uuid given");
 
+            Scene scene = m_application.SceneManager.CurrentScene;
             UUID[] accessControlList = scene.RegionInfo.EstateSettings.EstateAccess;
             Hashtable users = new Hashtable();
 
             foreach (UUID user in accessControlList)
             {
-                UUID scopeID = scene.RegionInfo.ScopeID;
-                UserAccount account = scene.UserAccountService.GetUserAccount(scopeID, user);
+                UUID scopeID = m_application.SceneManager.CurrentOrFirstScene.RegionInfo.ScopeID;
+                UserAccount account = m_application.SceneManager.CurrentOrFirstScene.UserAccountService.GetUserAccount(scopeID, user);
                 if (account != null)
                 {
                     users[user.ToString()] = account.FirstName + " " + account.LastName;
@@ -1748,7 +1893,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
 
             responseData["users"] = users;
-            responseData["success"] = true;
 
             m_log.Info("[RADMIN]: Access List List Request complete");
         }
@@ -1866,126 +2010,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
         }
 
-        private void CheckRegionParams(Hashtable requestData, Hashtable responseData)
-        {
-            //Checks if region parameters exist and gives exeption if no parameters are given
-            if ((requestData.ContainsKey("region_id") && !String.IsNullOrEmpty((string)requestData["region_id"])) ||
-                (requestData.ContainsKey("region_name") && !String.IsNullOrEmpty((string)requestData["region_name"])))
-            {
-                return;
-            }
-            #region Deprecate July 2012
-            //region_ID, regionid, region_uuid will be deprecated in July 2012!!!!!!
-            else if (requestData.ContainsKey("regionid") &&
-                !String.IsNullOrEmpty((string)requestData["regionid"]))
-            {
-                m_log.WarnFormat("[RADMIN]: Use of parameter regionid will be deprecated as of July 2012. Use region_id instead");
-            }
-            else if (requestData.ContainsKey("region_ID") &&
-                !String.IsNullOrEmpty((string)requestData["region_ID"]))
-            {
-                m_log.WarnFormat("[RADMIN]: Use of parameter region_ID will be deprecated as of July 2012. Use region_id instead");
-            }
-            else if (requestData.ContainsKey("regionID") &&
-                !String.IsNullOrEmpty((string)requestData["regionID"]))
-            {
-                m_log.WarnFormat("[RADMIN]: Use of parameter regionID will be deprecated as of July 2012. Use region_id instead");
-            }
-            else if (requestData.ContainsKey("region_uuid") &&
-                !String.IsNullOrEmpty((string)requestData["region_uuid"]))
-            {
-                m_log.WarnFormat("[RADMIN]: Use of parameter region_uuid will be deprecated as of July 2012. Use region_id instead");
-            }
-            #endregion
-            else
-            {
-                responseData["accepted"] = false;
-                throw new Exception("no region_name or region_id given");
-            }
-        }
-
-        private void GetSceneFromRegionParams(Hashtable requestData, Hashtable responseData, out Scene scene)
-        {
-            scene = null;
-
-            if (requestData.ContainsKey("region_id") &&
-                !String.IsNullOrEmpty((string)requestData["region_id"]))
-            {
-                UUID regionID = (UUID)(string)requestData["region_id"];
-                if (!m_application.SceneManager.TryGetScene(regionID, out scene))
-                {
-                    responseData["error"] = String.Format("Region ID {0} not found", regionID);
-                    throw new Exception(String.Format("Region ID {0} not found", regionID));
-                }
-            }
-            #region Deprecate July 2012
-            else if (requestData.ContainsKey("regionid") &&
-                !String.IsNullOrEmpty((string)requestData["regionid"]))
-            {
-                m_log.WarnFormat("[RADMIN]: Use of parameter regionid will be deprecated as of July 2012. Use region_id instead");
-
-                UUID regionID = (UUID)(string)requestData["regionid"];
-                if (!m_application.SceneManager.TryGetScene(regionID, out scene))
-                {
-                    responseData["error"] = String.Format("Region ID {0} not found", regionID);
-                    throw new Exception(String.Format("Region ID {0} not found", regionID));
-                }
-            }
-            else if (requestData.ContainsKey("region_ID") &&
-                !String.IsNullOrEmpty((string)requestData["region_ID"]))
-            {
-                m_log.WarnFormat("[RADMIN]: Use of parameter region_ID will be deprecated as of July 2012. Use region_id instead");
-
-                UUID regionID = (UUID)(string)requestData["region_ID"];
-                if (!m_application.SceneManager.TryGetScene(regionID, out scene))
-                {
-                    responseData["error"] = String.Format("Region ID {0} not found", regionID);
-                    throw new Exception(String.Format("Region ID {0} not found", regionID));
-                }
-            }
-            else if (requestData.ContainsKey("regionID") &&
-                !String.IsNullOrEmpty((string)requestData["regionID"]))
-            {
-                m_log.WarnFormat("[RADMIN]: Use of parameter regionID will be deprecated as of July 2012. Use region_id instead");
-
-                UUID regionID = (UUID)(string)requestData["regionID"];
-                if (!m_application.SceneManager.TryGetScene(regionID, out scene))
-                {
-                    responseData["error"] = String.Format("Region ID {0} not found", regionID);
-                    throw new Exception(String.Format("Region ID {0} not found", regionID));
-                }
-            }
-            else if (requestData.ContainsKey("region_uuid") &&
-                !String.IsNullOrEmpty((string)requestData["region_uuid"]))
-            {
-                m_log.WarnFormat("[RADMIN]: Use of parameter region_uuid will be deprecated as of July 2012. Use region_id instead");
-
-                UUID regionID = (UUID)(string)requestData["region_uuid"];
-                if (!m_application.SceneManager.TryGetScene(regionID, out scene))
-                {
-                    responseData["error"] = String.Format("Region ID {0} not found", regionID);
-                    throw new Exception(String.Format("Region ID {0} not found", regionID));
-                }
-            }
-            #endregion
-            else if (requestData.ContainsKey("region_name") &&
-                !String.IsNullOrEmpty((string)requestData["region_name"]))
-            {
-                string regionName = (string)requestData["region_name"];
-                if (!m_application.SceneManager.TryGetScene(regionName, out scene))
-                {
-                    responseData["error"] = String.Format("Region {0} not found", regionName);
-                    throw new Exception(String.Format("Region {0} not found", regionName));
-                }
-            }
-            else
-            {
-                responseData["error"] = "no region_name or region_id given";
-                throw new Exception("no region_name or region_id given");
-            }
-            return;
-        }
-
         private bool GetBoolean(Hashtable requestData, string tag, bool defaultValue)
         {
             // If an access value has been provided, apply it.

OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs

@@ -539,6 +539,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
         /// path has not already been registered, the method is added to the active
         /// handler table.
         /// </summary>
+
         public void AddStreamHandler(string httpMethod, string path, RestMethod method)
         {
             if (!IsEnabled)

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.ForEachRootScenePresence(delegate(ScenePresence sp)
+                    s.ForEachScenePresence(delegate(ScenePresence sp)
                     {
                         if (sp.Firstname == names[0] && sp.Lastname == names[1])
                         {

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,
-                                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+                                 OSHttpRequest httpRequest, OSHttpResponse 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(IOSHttpResponse httpResponse)
+        public string GetHandlerRegions(OSHttpResponse httpResponse)
         {
             RestXmlWriter rxw = new RestXmlWriter(new StringWriter());
 
@@ -95,7 +95,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
             return rxw.ToString();
         }
 
-        public string GetHandlerRegion(IOSHttpResponse httpResponse, string param)
+        public string GetHandlerRegion(OSHttpResponse 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(IOSHttpResponse httpResponse, Scene scene)
+        protected string RegionTerrain(OSHttpResponse 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(IOSHttpResponse httpResponse, Scene scene)
+        protected string RegionStats(OSHttpResponse 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(IOSHttpResponse httpResponse, Scene scene, Vector3 min, Vector3 max)
+        protected string RegionPrims(OSHttpResponse httpResponse, Scene scene, Vector3 min, Vector3 max)
         {
             httpResponse.SendChunked = true;
             httpResponse.ContentType = "text/xml";

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,
-                                           IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+                                           OSHttpRequest httpRequest, OSHttpResponse 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(IOSHttpResponse httpResponse)
+        public string GetRegionInfoHandlerRegions(OSHttpResponse httpResponse)
         {
             RestXmlWriter rxw = new RestXmlWriter(new StringWriter());
 

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,
-                                  IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+                                  OSHttpRequest httpRequest, OSHttpResponse 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(IOSHttpRequest request, IOSHttpResponse response)
+        public string CreateRegion(OSHttpRequest request, OSHttpResponse response)
         {
             RestXmlWriter rxw = new RestXmlWriter(new StringWriter());
 
@@ -108,7 +108,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
             return rxw.ToString();
         }
 
-        public string LoadPrims(string requestBody, IOSHttpRequest request, IOSHttpResponse response, Scene scene)
+        public string LoadPrims(string requestBody, OSHttpRequest request, OSHttpResponse response, Scene scene)
         {
             IRegionSerialiserModule serialiser = scene.RequestModuleInterface<IRegionSerialiserModule>();
             if (serialiser != null)

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(IOSHttpRequest request)
+        protected bool IsGod(OSHttpRequest 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(IOSHttpRequest request, UUID uuid)
+        protected bool IsVerifiedUser(OSHttpRequest 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(IOSHttpResponse response, OSHttpStatusCode status,
+        protected string Failure(OSHttpResponse 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(IOSHttpResponse response, OSHttpStatusCode status,
+        public string Failure(OSHttpResponse response, OSHttpStatusCode status,
                               string method, Exception e)
         {
             string m = String.Format("exception occurred: {0}", e.Message);

OpenSim/Capabilities/Caps.cs

@@ -98,17 +98,14 @@ namespace OpenSim.Framework.Capabilities
         {
             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; }
@@ -160,7 +157,11 @@ namespace OpenSim.Framework.Capabilities
 
         /// <summary>
         /// Remove all CAPS service handlers.
+        ///
         /// </summary>
+        /// <param name="httpListener"></param>
+        /// <param name="path"></param>
+        /// <param name="restMethod"></param>
         public void DeregisterHandlers()
         {
             if (m_capsHandlers != null)

OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs

@@ -1,124 +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;
-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;
-            llsdItem.type = invItem.AssetType;
-            llsdItem.inv_type = invItem.InvType;
-
-            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;
-            llsdItem.sale_info.sale_type = invItem.SaleType;
-
-            return llsdItem;
-        }
-    }
-}

OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2ServerConnector.cs

@@ -1,71 +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 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, "FetchInventory", null);
-            server.AddStreamHandler(reqHandler);
-        }
-    }
-}

OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs

@@ -66,14 +66,13 @@ namespace OpenSim.Capabilities.Handlers
                 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(),
-                    httpMethod => gmeshHandler.ProcessGetMesh(httpMethod, UUID.Zero, null),
-                    "GetMesh",
-                    null);
+            IRequestHandler reqHandler = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(),
+                                                       delegate(Hashtable m_dhttpMethod)
+                                                       {
+                                                           return gmeshHandler.ProcessGetMesh(m_dhttpMethod, UUID.Zero, null);
+                                                       });
             server.AddStreamHandler(reqHandler);
         }
+
     }
-}
+}

OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs

@@ -58,13 +58,13 @@ namespace OpenSim.Capabilities.Handlers
         // TODO: Change this to a config option
         const string REDIRECT_URL = null;
 
-        public GetTextureHandler(string path, IAssetService assService, string name, string description)
-            : base("GET", path, name, description)
+        public GetTextureHandler(string path, IAssetService assService) :
+                base("GET", path)
         {
             m_assetService = assService;
         }
 
-        public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        public override byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse)
         {
             // Try to parse the texture ID from the request URL
             NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query);
@@ -77,6 +77,7 @@ namespace OpenSim.Capabilities.Handlers
             {
                 m_log.Error("[GETTEXTURE]: Cannot fetch texture " + textureStr + " without an asset service");
                 httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
+                return null;
             }
 
             UUID textureID;
@@ -114,6 +115,7 @@ namespace OpenSim.Capabilities.Handlers
 //                "[GETTEXTURE]: For texture {0} sending back response {1}, data length {2}",
 //                textureID, httpResponse.StatusCode, httpResponse.ContentLength);
 
+            httpResponse.Send();
             return null;
         }
 
@@ -125,7 +127,7 @@ namespace OpenSim.Capabilities.Handlers
         /// <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)
+        private bool FetchTexture(OSHttpRequest httpRequest, OSHttpResponse httpResponse, UUID textureID, string format)
         {
 //            m_log.DebugFormat("[GETTEXTURE]: {0} with requested format {1}", textureID, format);
             AssetBase texture;
@@ -209,7 +211,7 @@ namespace OpenSim.Capabilities.Handlers
             return true;
         }
 
-        private void WriteTextureData(IOSHttpRequest request, IOSHttpResponse response, AssetBase texture, string format)
+        private void WriteTextureData(OSHttpRequest request, OSHttpResponse response, AssetBase texture, string format)
         {
             string range = request.Headers.GetOne("Range");
 
@@ -219,7 +221,6 @@ namespace OpenSim.Capabilities.Handlers
                 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)
@@ -265,14 +266,9 @@ namespace OpenSim.Capabilities.Handlers
                 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);
+//            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)

OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs

@@ -62,8 +62,8 @@ namespace OpenSim.Capabilities.Handlers
             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, "GetTexture", null));
+            server.AddStreamHandler(new GetTextureHandler("/CAPS/GetTexture/" /*+ UUID.Random() */, m_AssetService));
         }
+
     }
-}
+}

OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs

@@ -73,7 +73,7 @@ namespace OpenSim.Capabilities.Handlers
         /// <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)
+            string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse)
         {
             try
             {
@@ -85,8 +85,8 @@ namespace OpenSim.Capabilities.Handlers
                 uploader.OnUpLoad += BakedTextureUploaded;
 
                 m_HostCapsObj.HttpListener.AddStreamHandler(
-                    new BinaryStreamHandler(
-                        "POST", capsBase + uploaderPath, uploader.uploaderCaps, "UploadBakedTexture", null));
+                        new BinaryStreamHandler("POST", capsBase + uploaderPath,
+                        uploader.uploaderCaps));
 
                 string protocol = "http://";
 
@@ -104,7 +104,7 @@ namespace OpenSim.Capabilities.Handlers
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[UPLOAD BAKED TEXTURE HANDLER]: {0}{1}", e.Message, e.StackTrace);
+                m_log.Error("[UPLOAD BAKED TEXTURE HANDLER]: " + e.ToString());
             }
 
             return null;
@@ -117,7 +117,7 @@ namespace OpenSim.Capabilities.Handlers
         /// <param name="data"></param>
         private void BakedTextureUploaded(UUID assetID, byte[] data)
         {
-//            m_log.DebugFormat("[UPLOAD BAKED TEXTURE HANDLER]: Received baked texture {0}", assetID.ToString());
+            //            m_log.WarnFormat("[CAPS]: Received baked texture {0}", assetID.ToString());
 
             AssetBase asset;
             asset = new AssetBase(assetID, "Baked Texture", (sbyte)AssetType.Texture, m_HostCapsObj.AgentID.ToString());

OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs

@@ -42,6 +42,7 @@ using Caps = OpenSim.Framework.Capabilities.Caps;
 
 namespace OpenSim.Capabilities.Handlers
 {
+
     public class WebFetchInvDescHandler 
     {
         private static readonly ILog m_log =
@@ -49,7 +50,7 @@ namespace OpenSim.Capabilities.Handlers
 
         private IInventoryService m_InventoryService;
         private ILibraryService m_LibraryService;
-//        private object m_fetchLock = new Object();
+        private object m_fetchLock = new Object();
 
         public WebFetchInvDescHandler(IInventoryService invService, ILibraryService libService) 
         {
@@ -57,42 +58,39 @@ namespace OpenSim.Capabilities.Handlers
             m_LibraryService = libService;
         }
 
-        public string FetchInventoryDescendentsRequest(string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        public string FetchInventoryDescendentsRequest(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse 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 = "";
+            // 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 pe)
+            {
+                m_log.Error("[AGENT INVENTORY]: Fetch error: " + pe.Message);
+                m_log.Error("Request: " + request.ToString());
+            }
+
+            ArrayList foldersrequested = (ArrayList)hash["folders"];
+
+            string response = "";
+            lock (m_fetchLock)
+            {
                 for (int i = 0; i < foldersrequested.Count; i++)
                 {
                     string inventoryitemstr = "";
@@ -106,7 +104,7 @@ namespace OpenSim.Capabilities.Handlers
                     }
                     catch (Exception e)
                     {
-                        m_log.Debug("[WEB FETCH INV DESC HANDLER]: caught exception doing OSD deserialize" + e);
+                        m_log.Debug("[CAPS]: caught exception doing OSD deserialize" + e);
                     }
                     LLSDInventoryDescendents reply = FetchInventoryReply(llsdRequest);
 
@@ -117,6 +115,7 @@ namespace OpenSim.Capabilities.Handlers
                     response += inventoryitemstr;
                 }
 
+
                 if (response.Length == 0)
                 {
                     // Ter-guess: If requests fail a lot, the client seems to stop requesting descendants.
@@ -130,12 +129,11 @@ namespace OpenSim.Capabilities.Handlers
                     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);
+                //m_log.DebugFormat("[CAPS]: Replying to CAPS fetch inventory request with following xml");
+                //m_log.Debug("[CAPS] "+response);
 
-                return response;
-
-//            }
+            }
+            return response;
         }
 
         /// <summary>
@@ -156,24 +154,18 @@ namespace OpenSim.Capabilities.Handlers
             inv.Folders = new List<InventoryFolderBase>();
             inv.Items = new List<InventoryItemBase>();
             int version = 0;
-            int descendents = 0;
 
-            inv
-                = Fetch(
-                    invFetch.owner_id, invFetch.folder_id, invFetch.owner_id,
-                    invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order, out version, out descendents);
+            inv = Fetch(invFetch.owner_id, invFetch.folder_id, invFetch.owner_id, invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order, out version);
 
-            if (inv != null && inv.Folders != null)
+            if (inv.Folders != null)
             {
                 foreach (InventoryFolderBase invFolder in inv.Folders)
                 {
                     contents.categories.Array.Add(ConvertInventoryFolder(invFolder));
                 }
-
-                descendents += inv.Folders.Count;
             }
 
-            if (inv != null && inv.Items != null)
+            if (inv.Items != null)
             {
                 foreach (InventoryItemBase invItem in inv.Items)
                 {
@@ -181,58 +173,30 @@ namespace OpenSim.Capabilities.Handlers
                 }
             }
 
-            contents.descendents = descendents;
+            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, out int descendents)
+        public 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!
+            m_log.DebugFormat(
+                "[WEBFETCHINVENTORYDESCENDANTS]: Fetching folders ({0}), items ({1}) from {2} for agent {3}",
+                fetchFolders, fetchItems, folderID, agentID);
 
             version = 0;
-            descendents = 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();
-                    descendents = ret.Folders.Count + ret.Items.Count;
 
                     return ret;
                 }
-            }
 
             InventoryCollection contents = new InventoryCollection();
 
@@ -243,7 +207,6 @@ namespace OpenSim.Capabilities.Handlers
                 containingFolder.ID = folderID;
                 containingFolder.Owner = agentID;
                 containingFolder = m_InventoryService.GetFolder(containingFolder);
-
                 if (containingFolder != null)
                 {
 //                    m_log.DebugFormat(
@@ -251,73 +214,25 @@ namespace OpenSim.Capabilities.Handlers
 //                        containingFolder.Name, containingFolder.ID, agentID);
 
                     version = containingFolder.Version;
-
-                    if (fetchItems)
-                    {
-                        List<InventoryItemBase> itemsToReturn = contents.Items;
-                        List<InventoryItemBase> originalItems = new List<InventoryItemBase>(itemsToReturn);
-
-                        // descendents must only include the links, not the linked items we add
-                        descendents = originalItems.Count;
-
-                        // Add target items for links in this folder before the links themselves.
-                        foreach (InventoryItemBase item in originalItems)
-                        {
-                            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)
-                                    itemsToReturn.Insert(0, linkedItem);
-                            }
-                        }
-
-                        // Now scan for folder links and insert the items they target and those links at the head of the return data
-                        foreach (InventoryItemBase item in originalItems)
-                        {
-                            if (item.AssetType == (int)AssetType.LinkFolder)
-                            {
-                                InventoryCollection linkedFolderContents = m_InventoryService.GetFolderContent(ownerID, item.AssetID);
-                                List<InventoryItemBase> links = linkedFolderContents.Items;
-
-                                itemsToReturn.InsertRange(0, links);
-
-                                foreach (InventoryItemBase link in linkedFolderContents.Items)
-                                {
-                                    // 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 (link != null)
-                                    {
-//                                        m_log.DebugFormat(
-//                                            "[WEB FETCH INV DESC HANDLER]: Adding item {0} {1} from folder {2} linked from {3}",
-//                                            link.Name, (AssetType)link.AssetType, item.AssetID, containingFolder.Name);
-
-                                        InventoryItemBase linkedItem
-                                            = m_InventoryService.GetItem(new InventoryItemBase(link.AssetID));
-
-                                        if (linkedItem != null)
-                                            itemsToReturn.Insert(0, linkedItem);
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-//                    foreach (InventoryItemBase item in contents.Items)
+//
+//                    if (fetchItems)
 //                    {
-//                        m_log.DebugFormat(
-//                            "[WEB FETCH INV DESC HANDLER]: Returning item {0}, type {1}, parent {2} in {3} {4}",
-//                            item.Name, (AssetType)item.AssetType, item.Folder, containingFolder.Name, containingFolder.ID);
-//                    }
-
-                    // =====
-
+//                        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)
 //                        {
@@ -376,7 +291,7 @@ namespace OpenSim.Capabilities.Handlers
             }
             else
             {
-                // Lost items don't really need a version
+                // Lost itemsm don't really need a version
                 version = 1;
             }
 
@@ -394,8 +309,11 @@ namespace OpenSim.Capabilities.Handlers
             llsdFolder.folder_id = invFolder.ID;
             llsdFolder.parent_id = invFolder.ParentID;
             llsdFolder.name = invFolder.Name;
-            llsdFolder.type = invFolder.Type;
-            llsdFolder.preferred_type = -1;
+            if (invFolder.Type < 0 || invFolder.Type >= TaskInventoryItem.Types.Length)
+                llsdFolder.type = "-1";
+            else
+                llsdFolder.type = TaskInventoryItem.Types[invFolder.Type];
+            llsdFolder.preferred_type = "-1";
 
             return llsdFolder;
         }
@@ -415,9 +333,16 @@ namespace OpenSim.Capabilities.Handlers
             llsdItem.item_id = invItem.ID;
             llsdItem.name = invItem.Name;
             llsdItem.parent_id = invItem.Folder;
-            llsdItem.type = invItem.AssetType;
-            llsdItem.inv_type = invItem.InvType;
-
+            try
+            {
+                // TODO reevaluate after upgrade to libomv >= r2566. Probably should use UtilsConversions.
+                llsdItem.type = TaskInventoryItem.Types[invItem.AssetType];
+                llsdItem.inv_type = TaskInventoryItem.InvTypes[invItem.InvType];
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[CAPS]: 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;
@@ -430,9 +355,24 @@ namespace OpenSim.Capabilities.Handlers
             llsdItem.permissions.owner_mask = (int)invItem.CurrentPermissions;
             llsdItem.sale_info = new LLSDSaleInfo();
             llsdItem.sale_info.sale_price = invItem.SalePrice;
-            llsdItem.sale_info.sale_type = invItem.SaleType;
+            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;
         }
+
     }
-}
+}

OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescServerConnector.cs

@@ -68,13 +68,7 @@ namespace OpenSim.Capabilities.Handlers
                     ServerUtils.LoadPlugin<ILibraryService>(libService, args);
 
             WebFetchInvDescHandler webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService);
-            IRequestHandler reqHandler
-                = new RestStreamHandler(
-                    "POST",
-                    "/CAPS/WebFetchInvDesc/" /*+ UUID.Random()*/,
-                    webFetchHandler.FetchInventoryDescendentsRequest,
-                    "WebFetchInvDesc",
-                    null);
+            IRequestHandler reqHandler = new RestStreamHandler("POST", "/CAPS/WebFetchInvDesc/" /*+ UUID.Random()*/, webFetchHandler.FetchInventoryDescendentsRequest);
             server.AddStreamHandler(reqHandler);
         }
 

OpenSim/Capabilities/LLSDEnvironmentSettings.cs

@@ -1,68 +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 OpenMetaverse;
-
-namespace OpenSim.Framework.Capabilities
-{
-    [OSDMap]
-    public class LLSDEnvironmentRequest
-    {
-        public UUID messageID;
-        public UUID regionID;
-    }
-
-    [OSDMap]
-    public class LLSDEnvironmentSetResponse
-    {
-        public UUID regionID;
-        public UUID messageID;
-        public Boolean success;
-        public String fail_reason;
-    }
-
-    public class EnvironmentSettings
-    {
-        /// <summary>
-        /// generates a empty llsd settings response for viewer
-        /// </summary>
-        /// <param name="messageID">the message UUID</param>
-        /// <param name="regionID">the region UUID</param>
-        public static string EmptySettings(UUID messageID, UUID regionID)
-        {
-            OSDArray arr = new OSDArray();
-            LLSDEnvironmentRequest msg = new LLSDEnvironmentRequest();
-            msg.messageID = messageID;
-            msg.regionID = regionID;
-            arr.Array.Add(msg);
-            return LLSDHelpers.SerialiseLLSDReply(arr);
-        }
-    }
-
-}

OpenSim/Capabilities/LLSDInventoryFolder.cs

@@ -35,7 +35,7 @@ namespace OpenSim.Framework.Capabilities
         public UUID folder_id;
         public UUID parent_id;
         public string name;
-        public int type;
-        public int preferred_type;
+        public string type;
+        public string preferred_type;
     }
 }

OpenSim/Capabilities/LLSDInventoryItem.cs

@@ -37,8 +37,8 @@ namespace OpenSim.Framework.Capabilities
         public UUID asset_id;
         public UUID item_id;
         public LLSDPermissions permissions;
-        public int type;
-        public int inv_type;
+        public string type;
+        public string inv_type;
         public int flags;
 
         public LLSDSaleInfo sale_info;
@@ -65,7 +65,7 @@ namespace OpenSim.Framework.Capabilities
     public class LLSDSaleInfo
     {
         public int sale_price;
-        public int sale_type;
+        public string sale_type;
     }
 
     [OSDMap]
@@ -95,11 +95,4 @@ namespace OpenSim.Framework.Capabilities
         public UUID owner_id; 
         public int version;
     }
-
-    [OSDMap]
-    public class LLSDFetchInventory
-    {
-        public UUID agent_id;
-        public OSDArray items = new OSDArray();
-    }
-}
+}

OpenSim/Capabilities/LLSDStreamHandler.cs

@@ -39,17 +39,13 @@ namespace OpenSim.Framework.Capabilities
         private LLSDMethod<TRequest, TResponse> m_method;
 
         public LLSDStreamhandler(string httpMethod, string path, LLSDMethod<TRequest, TResponse> method)
-            : this(httpMethod, path, method, null, null) {}
-
-        public LLSDStreamhandler(
-            string httpMethod, string path, LLSDMethod<TRequest, TResponse> method, string name, string description)
-            : base(httpMethod, path, name, description)
+            : base(httpMethod, path)
         {
             m_method = method;
         }
 
         public override byte[] Handle(string path, Stream request,
-                                      IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+                                      OSHttpRequest httpRequest, OSHttpResponse httpResponse)
         {
             //Encoding encoding = Util.UTF8;
             //StreamReader streamReader = new StreamReader(request, false);
@@ -66,7 +62,9 @@ namespace OpenSim.Framework.Capabilities
 
             TResponse response = m_method(llsdRequest);
 
-            return Util.UTF8NoBomEncoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response));
+            Encoding encoding = new UTF8Encoding(false);
+
+            return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response));
         }
     }
 }

OpenSim/ConsoleClient/Requester.cs

@@ -50,7 +50,7 @@ namespace OpenSim.ConsoleClient
 
             request.ContentType = "application/x-www-form-urlencoded";
 
-            byte[] buffer = Encoding.ASCII.GetBytes(data);
+            byte[] buffer = new System.Text.ASCIIEncoding().GetBytes(data);
             int length = (int) buffer.Length;
             request.ContentLength = length;
 

OpenSim/Data/IXAssetDataPlugin.cs

@@ -1,47 +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.Collections.Generic;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data
-{
-    /// <summary>
-    /// This interface exists to distinguish between the normal IAssetDataPlugin and the one used by XAssetService
-    /// for now.
-    /// </summary>
-    public interface IXAssetDataPlugin : IPlugin
-    {
-        AssetBase GetAsset(UUID uuid);
-        void StoreAsset(AssetBase asset);
-        bool ExistsAsset(UUID uuid);
-        List<AssetMetadata> FetchAssetMetadataSet(int start, int count);
-        void Initialise(string connect);
-        bool Delete(string id);
-    }
-}

OpenSim/Data/IXInventoryData.cs

@@ -40,11 +40,6 @@ namespace OpenSim.Data
         public UUID folderID;
         public UUID agentID;
         public UUID parentFolderID;
-
-        public XInventoryFolder Clone()
-        {
-            return (XInventoryFolder)MemberwiseClone();
-        }
     }
 
     public class XInventoryItem
@@ -69,11 +64,6 @@ namespace OpenSim.Data
         public UUID avatarID;
         public UUID parentFolderID;
         public int inventoryGroupPermissions;
-
-        public XInventoryItem Clone()
-        {
-            return (XInventoryItem)MemberwiseClone();
-        }
     }
 
     public interface IXInventoryData

OpenSim/Data/MSSQL/MSSQLFriendsData.cs

@@ -89,11 +89,5 @@ namespace OpenSim.Data.MSSQL
                 return DoQuery(cmd);
             }
         }
-
-        public FriendsData[] GetFriends(Guid principalID)
-        {
-            return GetFriends(principalID.ToString());
-        }
- 
     }
 }

OpenSim/Data/MSSQL/MSSQLInventoryData.cs

@@ -813,7 +813,7 @@ namespace OpenSim.Data.MSSQL
         {
             try
             {
-                using (SqlCommand command = new SqlCommand("DELETE FROM inventoryfolders WHERE folderID=@folderID and type=-1", connection))
+                using (SqlCommand command = new SqlCommand("DELETE FROM inventoryfolders WHERE folderID=@folderID", connection))
                 {
                     command.Parameters.Add(database.CreateParameter("folderID", folderID));
 

OpenSim/Data/MSSQL/MSSQLManager.cs

@@ -104,11 +104,6 @@ namespace OpenSim.Data.MSSQL
             {
                 return SqlDbType.BigInt;
             }
-            if (type == typeof(DateTime))
-            {
-                return SqlDbType.DateTime;
-            }
-
             return SqlDbType.VarChar;
         }
 

OpenSim/Data/MSSQL/MSSQLSimulationData.cs

@@ -675,13 +675,13 @@ VALUES
                 cmd.ExecuteNonQuery();
             }
 
-            sql = "INSERT INTO [landaccesslist] ([LandUUID],[AccessUUID],[Flags],[Expires]) VALUES (@LandUUID,@AccessUUID,@Flags,@Expires)";
+            sql = "INSERT INTO [landaccesslist] ([LandUUID],[AccessUUID],[Flags]) VALUES (@LandUUID,@AccessUUID,@Flags)";
 
             using (SqlConnection conn = new SqlConnection(m_connectionString))
             using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
                 conn.Open();
-                foreach (LandAccessEntry parcelAccessEntry in parcel.LandData.ParcelAccessList)
+                foreach (ParcelManager.ParcelAccessEntry parcelAccessEntry in parcel.LandData.ParcelAccessList)
                 {
                     cmd.Parameters.AddRange(CreateLandAccessParameters(parcelAccessEntry, parcel.RegionUUID));
 
@@ -1181,72 +1181,6 @@ VALUES
             //            }
             #endregion
         }
-
-        #region Environment Settings
-        public string LoadRegionEnvironmentSettings(UUID regionUUID)
-        {
-            string sql = "select * from [regionenvironment] where region_id = @region_id";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(_Database.CreateParameter("@region_id", regionUUID));
-                conn.Open();
-                using (SqlDataReader result = cmd.ExecuteReader())
-                {
-                    if (!result.Read())
-                    {
-                        return String.Empty;
-                    }
-                    else
-                    {
-                        return Convert.ToString(result["llsd_settings"]);
-                    }
-                }
-            }
-        }
-
-        public void StoreRegionEnvironmentSettings(UUID regionUUID, string settings)
-        {
-            {
-                string sql = "DELETE FROM [regionenvironment] WHERE region_id = @region_id";
-                using (SqlConnection conn = new SqlConnection(m_connectionString))
-
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
-                {
-                    cmd.Parameters.Add(_Database.CreateParameter("@region_id", regionUUID));
-                    conn.Open();
-                    cmd.ExecuteNonQuery();
-                }
-
-                sql = "INSERT INTO [regionenvironment] (region_id, llsd_settings) VALUES (@region_id, @llsd_settings)";
-
-                using (SqlConnection conn = new SqlConnection(m_connectionString))
-
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
-                {
-                    cmd.Parameters.Add(_Database.CreateParameter("@region_id", regionUUID));
-                    cmd.Parameters.Add(_Database.CreateParameter("@llsd_settings", settings));
-
-                    conn.Open();
-                    cmd.ExecuteNonQuery();
-                }
-            }
-        }
-
-        public void RemoveRegionEnvironmentSettings(UUID regionUUID)
-        {
-            string sql = "delete from [regionenvironment] where region_id = @region_id";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(_Database.CreateParameter("@region_id", regionUUID));
-
-                conn.Open();
-                cmd.ExecuteNonQuery();
-            }
-        }
-        #endregion
-
         /// <summary>
         /// Loads the settings of a region.
         /// </summary>
@@ -1281,8 +1215,6 @@ VALUES
             //Store new values
             StoreNewRegionSettings(regionSettings);
 
-            LoadSpawnPoints(regionSettings);
-
             return regionSettings;
         }
 
@@ -1320,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 ,[covenant_datetime] = @covenant_datetime, [sunvectorx] = @sunvectorx, [sunvectory] = @sunvectory, [sunvectorz] = @sunvectorz,  [Sandbox] = @Sandbox, [loaded_creation_datetime] = @loaded_creation_datetime, [loaded_creation_id] = @loaded_creation_id, [map_tile_id] = @TerrainImageID, [telehubobject] = @telehubobject, [parcel_tile_id] = @ParcelImageID
+,[covenant] = @covenant , [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))
@@ -1331,7 +1263,6 @@ VALUES
                     cmd.ExecuteNonQuery();
                 }
             }
-            SaveSpawnPoints(regionSettings);
         }
 
         public void Shutdown()
@@ -1376,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],[covenant_datetime],[sunvectorx], [sunvectory], [sunvectorz],[Sandbox], [loaded_creation_datetime], [loaded_creation_id]
+                                [terrain_lower_limit],[use_estate_sun],[fixed_sun],[sun_position],[covenant],[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, @covenant_datetime, @sunvectorx,@sunvectory, @sunvectorz, @Sandbox, @loaded_creation_datetime, @loaded_creation_id)";
+                                @terrain_lower_limit,@use_estate_sun,@fixed_sun,@sun_position,@covenant,@sunvectorx,@sunvectory, @sunvectorz, @Sandbox, @loaded_creation_datetime, @loaded_creation_id)";
 
             using (SqlConnection conn = new SqlConnection(m_connectionString))
             using (SqlCommand cmd = new SqlCommand(sql, conn))
@@ -1436,7 +1367,7 @@ VALUES
             newSettings.TerrainRaiseLimit = Convert.ToDouble(row["terrain_raise_limit"]);
             newSettings.TerrainLowerLimit = Convert.ToDouble(row["terrain_lower_limit"]);
             newSettings.UseEstateSun = Convert.ToBoolean(row["use_estate_sun"]);
-            newSettings.Sandbox = Convert.ToBoolean(row["Sandbox"]);
+            newSettings.Sandbox = Convert.ToBoolean(row["sandbox"]);
             newSettings.FixedSun = Convert.ToBoolean(row["fixed_sun"]);
             newSettings.SunPosition = Convert.ToDouble(row["sun_position"]);
             newSettings.SunVector = new Vector3(
@@ -1445,18 +1376,13 @@ 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)
                 newSettings.LoadedCreationID = "";
             else
                 newSettings.LoadedCreationID = (String)row["loaded_creation_id"];
-
-            newSettings.TerrainImageID = new UUID((string)row["map_tile_ID"]);
-            newSettings.ParcelImageID = new UUID((Guid)row["parcel_tile_ID"]);
-            newSettings.TelehubObject = new UUID((Guid)row["TelehubObject"]);
-
             return newSettings;
         }
 
@@ -1527,14 +1453,7 @@ VALUES
                 _Log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name);
             }
 
-            newData.ParcelAccessList = new List<LandAccessEntry>();
-            newData.MediaDescription = (string)row["MediaDescription"];
-            newData.MediaType = (string)row["MediaType"];
-            newData.MediaWidth = Convert.ToInt32((((string)row["MediaSize"]).Split(','))[0]);
-            newData.MediaHeight = Convert.ToInt32((((string)row["MediaSize"]).Split(','))[1]);
-            newData.MediaLoop = Convert.ToBoolean(row["MediaLoop"]);
-            newData.ObscureMusic = Convert.ToBoolean(row["ObscureMusic"]);
-            newData.ObscureMedia = Convert.ToBoolean(row["ObscureMedia"]);
+            newData.ParcelAccessList = new List<ParcelManager.ParcelAccessEntry>();
 
             return newData;
         }
@@ -1544,12 +1463,12 @@ VALUES
         /// </summary>
         /// <param name="row">datarecord with landaccess data</param>
         /// <returns></returns>
-        private static LandAccessEntry BuildLandAccessData(IDataRecord row)
+        private static ParcelManager.ParcelAccessEntry BuildLandAccessData(IDataRecord row)
         {
-            LandAccessEntry entry = new LandAccessEntry();
+            ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
             entry.AgentID = new UUID((Guid)row["AccessUUID"]);
             entry.Flags = (AccessList)Convert.ToInt32(row["Flags"]);
-            entry.Expires = Convert.ToInt32(row["Expires"]);
+            entry.Time = new DateTime();
             return entry;
         }
 
@@ -1578,8 +1497,7 @@ VALUES
             prim.TouchName = (string)primRow["TouchName"];
             // permissions
             prim.Flags = (PrimFlags)Convert.ToUInt32(primRow["ObjectFlags"]);
-            //prim.CreatorID = new UUID((Guid)primRow["CreatorID"]);
-            prim.CreatorIdentification = (string)primRow["CreatorID"];
+            prim.CreatorID = new UUID((Guid)primRow["CreatorID"]);
             prim.OwnerID = new UUID((Guid)primRow["OwnerID"]);
             prim.GroupID = new UUID((Guid)primRow["GroupID"]);
             prim.LastOwnerID = new UUID((Guid)primRow["LastOwnerID"]);
@@ -1773,8 +1691,7 @@ VALUES
             taskItem.Name = (string)inventoryRow["name"];
             taskItem.Description = (string)inventoryRow["description"];
             taskItem.CreationDate = Convert.ToUInt32(inventoryRow["creationDate"]);
-            //taskItem.CreatorID = new UUID((Guid)inventoryRow["creatorID"]);
-            taskItem.CreatorIdentification = (string)inventoryRow["creatorID"];
+            taskItem.CreatorID = new UUID((Guid)inventoryRow["creatorID"]);
             taskItem.OwnerID = new UUID((Guid)inventoryRow["ownerID"]);
             taskItem.LastOwnerID = new UUID((Guid)inventoryRow["lastOwnerID"]);
             taskItem.GroupID = new UUID((Guid)inventoryRow["groupID"]);
@@ -1865,19 +1782,15 @@ VALUES
             parameters.Add(_Database.CreateParameter("terrain_raise_limit", settings.TerrainRaiseLimit));
             parameters.Add(_Database.CreateParameter("terrain_lower_limit", settings.TerrainLowerLimit));
             parameters.Add(_Database.CreateParameter("use_estate_sun", settings.UseEstateSun));
-            parameters.Add(_Database.CreateParameter("Sandbox", settings.Sandbox));
+            parameters.Add(_Database.CreateParameter("sandbox", settings.Sandbox));
             parameters.Add(_Database.CreateParameter("fixed_sun", settings.FixedSun));
             parameters.Add(_Database.CreateParameter("sun_position", settings.SunPosition));
             parameters.Add(_Database.CreateParameter("sunvectorx", settings.SunVector.X));
             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));
-            parameters.Add(_Database.CreateParameter("TerrainImageID", settings.TerrainImageID));
-            parameters.Add(_Database.CreateParameter("ParcelImageID", settings.ParcelImageID));
-            parameters.Add(_Database.CreateParameter("TelehubObject", settings.TelehubObject));
 
             return parameters.ToArray();
         }
@@ -1938,14 +1851,13 @@ VALUES
         /// <param name="parcelAccessEntry">parcel access entry.</param>
         /// <param name="parcelID">parcel ID.</param>
         /// <returns></returns>
-        private SqlParameter[] CreateLandAccessParameters(LandAccessEntry parcelAccessEntry, UUID parcelID)
+        private SqlParameter[] CreateLandAccessParameters(ParcelManager.ParcelAccessEntry parcelAccessEntry, UUID parcelID)
         {
             List<SqlParameter> parameters = new List<SqlParameter>();
 
             parameters.Add(_Database.CreateParameter("LandUUID", parcelID));
             parameters.Add(_Database.CreateParameter("AccessUUID", parcelAccessEntry.AgentID));
             parameters.Add(_Database.CreateParameter("Flags", parcelAccessEntry.Flags));
-            parameters.Add(_Database.CreateParameter("Expires", parcelAccessEntry.Expires));
 
             return parameters.ToArray();
         }
@@ -2150,70 +2062,5 @@ VALUES
         #endregion
 
         #endregion
-
-        private void LoadSpawnPoints(RegionSettings rs)
-        {
-            rs.ClearSpawnPoints();
-
-            string sql = "SELECT Yaw, Pitch, Distance FROM spawn_points WHERE RegionUUID = @RegionUUID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(_Database.CreateParameter("@RegionUUID", rs.RegionUUID.ToString()));
-                conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
-                {
-                    if (reader.Read())
-                    {
-                        SpawnPoint sp = new SpawnPoint();
-
-                        sp.Yaw = (float)reader["Yaw"];
-                        sp.Pitch = (float)reader["Pitch"];
-                        sp.Distance = (float)reader["Distance"];
-
-                        rs.AddSpawnPoint(sp);
-                    }
-                }
-            }
-        }
-
-        private void SaveSpawnPoints(RegionSettings rs)
-        {
-            string sql = "DELETE FROM spawn_points WHERE RegionUUID = @RegionUUID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(_Database.CreateParameter("@RegionUUID", rs.RegionUUID));
-                conn.Open();
-                cmd.ExecuteNonQuery();
-            }
-            foreach (SpawnPoint p in rs.SpawnPoints())
-            {
-                sql = "INSERT INTO spawn_points (RegionUUID, Yaw, Pitch, Distance) VALUES (@RegionUUID, @Yaw, @Pitch, @Distance)";
-                using (SqlConnection conn = new SqlConnection(m_connectionString))
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
-                {
-                    cmd.Parameters.Add(_Database.CreateParameter("@RegionUUID", rs.RegionUUID));
-                    cmd.Parameters.Add(_Database.CreateParameter("@Yaw", p.Yaw));
-                    cmd.Parameters.Add(_Database.CreateParameter("@Pitch", p.Pitch));
-                    cmd.Parameters.Add(_Database.CreateParameter("@Distance", p.Distance));
-                    conn.Open();
-                    cmd.ExecuteNonQuery();
-                }
-            }
-        }
-
-        public void SaveExtra(UUID regionID, string name, string value)
-        {
-        }
-
-        public void RemoveExtra(UUID regionID, string name)
-        {
-        }
-
-        public Dictionary<string, string> GetExtra(UUID regionID)
-        {
-            return null;
-        }
     }
 }

OpenSim/Data/MSSQL/Resources/GridStore.migrations

@@ -235,11 +235,4 @@ 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
-
-:VERSION 9
-
-BEGIN TRANSACTION
-ALTER TABLE regions ADD parcelMapTexture uniqueidentifier NULL;
-
-COMMIT
+COMMIT

OpenSim/Data/MSSQL/Resources/RegionStore.migrations

@@ -1043,108 +1043,3 @@ FOR CreatorID
 ALTER TABLE primitems ALTER COLUMN CreatorID uniqueidentifier NOT NULL
 
 COMMIT
-
-:VERSION 29         #----------------- Region Covenant changed time
-
-BEGIN TRANSACTION
-
-ALTER TABLE regionsettings ADD covenant_datetime int NOT NULL default 0
-
-COMMIT
-
-:VERSION 30         #------------------Migrate creatorID storage to varchars instead of UUIDs for HG support
-
-BEGIN TRANSACTION
-
-EXECUTE sp_rename N'dbo.prims.creatorid', N'creatoridold', 'COLUMN'
-EXECUTE sp_rename N'dbo.primitems.creatorid', N'creatoridold', 'COLUMN'
-
-COMMIT
-
-:VERSION 31        #---------------------
-
-BEGIN TRANSACTION
-
-ALTER TABLE prims ADD CreatorID varchar(255)
-ALTER TABLE primitems ADD CreatorID varchar(255)
-
-COMMIT
-
-:VERSION 32        #---------------------
-
-BEGIN TRANSACTION
-
-UPDATE prims SET prims.CreatorID = CONVERT(varchar(255), creatoridold)
-UPDATE primitems SET primitems.CreatorID = CONVERT(varchar(255), creatoridold)
-
-COMMIT
-
-:VERSION 33       #---------------------
-
-BEGIN TRANSACTION
-
-ALTER TABLE prims 
-ADD CONSTRAINT DF_prims_CreatorIDNew 
-DEFAULT '00000000-0000-0000-0000-000000000000' 
-FOR CreatorID
-
-ALTER TABLE prims ALTER COLUMN CreatorID varchar(255) NOT NULL
-
-ALTER TABLE primitems
-ADD CONSTRAINT DF_primitems_CreatorIDNew
-DEFAULT '00000000-0000-0000-0000-000000000000' 
-FOR CreatorID
-
-ALTER TABLE primitems ALTER COLUMN CreatorID varchar(255) NOT NULL
-
-COMMIT
-
-:VERSION 34		  #--------------- Telehub support
-
-BEGIN TRANSACTION
-
-CREATE TABLE [dbo].[Spawn_Points](
-	[RegionUUID] [uniqueidentifier] NOT NULL,
-	[Yaw] [float] NOT NULL,
-	[Pitch] [float] NOT NULL,
-	[Distance] [float] NOT NULL,
-	PRIMARY KEY CLUSTERED 
-	(
-		[RegionUUID] ASC
-	)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
-) ON [PRIMARY]
-
-ALTER TABLE regionsettings ADD TelehubObject uniqueidentifier NOT NULL  DEFAULT '00000000-0000-0000-0000-000000000000';
-
-COMMIT
-
-:VERSION 35       #---------------- Parcels for sale
-
-BEGIN TRANSACTION
-
-ALTER TABLE regionsettings ADD parcel_tile_ID uniqueidentifier NOT NULL  DEFAULT '00000000-0000-0000-0000-000000000000';
-
-COMMIT
-
-:VERSION 36       #---------------- Timed bans/access
-
-BEGIN TRANSACTION
-
-ALTER TABLE landaccesslist ADD Expires integer NOT NULL  DEFAULT 0;
-
-COMMIT
-
-:VERSION 37       #---------------- Environment Settings
-
-BEGIN TRANSACTION
-
-CREATE TABLE [dbo].[regionenvironment](
-	[region_id] [uniqueidentifier] NOT NULL,
-	[llsd_settings] [varchar](max) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
- PRIMARY KEY CLUSTERED
-(
-	[region_id] ASC
-)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
-) ON [PRIMARY]
-
-COMMIT

OpenSim/Data/MySQL/MySQLAssetData.cs

@@ -163,52 +163,53 @@ namespace OpenSim.Data.MySQL
                 {
                     dbcon.Open();
 
-                    using (MySqlCommand cmd =
+                    MySqlCommand cmd =
                         new MySqlCommand(
                             "replace INTO assets(id, name, description, assetType, local, temporary, create_time, access_time, asset_flags, CreatorID, data)" +
                             "VALUES(?id, ?name, ?description, ?assetType, ?local, ?temporary, ?create_time, ?access_time, ?asset_flags, ?CreatorID, ?data)",
-                            dbcon))
+                            dbcon);
+
+                    string assetName = asset.Name;
+                    if (asset.Name.Length > 64)
                     {
-                        string assetName = asset.Name;
-                        if (asset.Name.Length > 64)
+                        assetName = asset.Name.Substring(0, 64);
+                        m_log.Warn("[ASSET DB]: Name field truncated from " + asset.Name.Length + " to " + assetName.Length + " characters on add");
+                    }
+
+                    string assetDescription = asset.Description;
+                    if (asset.Description.Length > 64)
+                    {
+                        assetDescription = asset.Description.Substring(0, 64);
+                        m_log.Warn("[ASSET DB]: Description field truncated from " + asset.Description.Length + " to " + assetDescription.Length + " characters on add");
+                    }
+
+                    // need to ensure we dispose
+                    try
+                    {
+                        using (cmd)
                         {
-                            assetName = asset.Name.Substring(0, 64);
-                            m_log.Warn("[ASSET DB]: Name field truncated from " + asset.Name.Length + " to " + assetName.Length + " characters on add");
-                        }
-    
-                        string assetDescription = asset.Description;
-                        if (asset.Description.Length > 64)
-                        {
-                            assetDescription = asset.Description.Substring(0, 64);
-                            m_log.Warn("[ASSET DB]: Description field truncated from " + asset.Description.Length + " to " + assetDescription.Length + " characters on add");
-                        }
-    
-                        try
-                        {
-                            using (cmd)
-                            {
-                                // create unix epoch time
-                                int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
-                                cmd.Parameters.AddWithValue("?id", asset.ID);
-                                cmd.Parameters.AddWithValue("?name", assetName);
-                                cmd.Parameters.AddWithValue("?description", assetDescription);
-                                cmd.Parameters.AddWithValue("?assetType", asset.Type);
-                                cmd.Parameters.AddWithValue("?local", asset.Local);
-                                cmd.Parameters.AddWithValue("?temporary", asset.Temporary);
-                                cmd.Parameters.AddWithValue("?create_time", now);
-                                cmd.Parameters.AddWithValue("?access_time", now);
-                                cmd.Parameters.AddWithValue("?CreatorID", asset.Metadata.CreatorID);
-                                cmd.Parameters.AddWithValue("?asset_flags", (int)asset.Flags);
-                                cmd.Parameters.AddWithValue("?data", asset.Data);
-                                cmd.ExecuteNonQuery();
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Error: {2}",
-                                asset.FullID, asset.Name, e.Message);
+                            // create unix epoch time
+                            int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
+                            cmd.Parameters.AddWithValue("?id", asset.ID);
+                            cmd.Parameters.AddWithValue("?name", assetName);
+                            cmd.Parameters.AddWithValue("?description", assetDescription);
+                            cmd.Parameters.AddWithValue("?assetType", asset.Type);
+                            cmd.Parameters.AddWithValue("?local", asset.Local);
+                            cmd.Parameters.AddWithValue("?temporary", asset.Temporary);
+                            cmd.Parameters.AddWithValue("?create_time", now);
+                            cmd.Parameters.AddWithValue("?access_time", now);
+                            cmd.Parameters.AddWithValue("?CreatorID", asset.Metadata.CreatorID);
+                            cmd.Parameters.AddWithValue("?asset_flags", (int)asset.Flags);
+                            cmd.Parameters.AddWithValue("?data", asset.Data);
+                            cmd.ExecuteNonQuery();
+                            cmd.Dispose();
                         }
                     }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Error: {2}",
+                            asset.FullID, asset.Name, e.Message);
+                    }
                 }
             }
         }
@@ -220,31 +221,33 @@ namespace OpenSim.Data.MySQL
                 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                 {
                     dbcon.Open();
+                    MySqlCommand cmd =
+                        new MySqlCommand("update assets set access_time=?access_time where id=?id",
+                                         dbcon);
 
-                    using (MySqlCommand cmd
-                        = new MySqlCommand("update assets set access_time=?access_time where id=?id", dbcon))
+                    // need to ensure we dispose
+                    try
                     {
-                        try
+                        using (cmd)
                         {
-                            using (cmd)
-                            {
-                                // create unix epoch time
-                                int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
-                                cmd.Parameters.AddWithValue("?id", asset.ID);
-                                cmd.Parameters.AddWithValue("?access_time", now);
-                                cmd.ExecuteNonQuery();
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.ErrorFormat(
-                                "[ASSETS DB]: " +
-                                "MySql failure updating access_time for asset {0} with name {1}" + Environment.NewLine + e.ToString()
-                                + Environment.NewLine + "Attempting reconnection", asset.FullID, asset.Name);
+                            // create unix epoch time
+                            int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
+                            cmd.Parameters.AddWithValue("?id", asset.ID);
+                            cmd.Parameters.AddWithValue("?access_time", now);
+                            cmd.ExecuteNonQuery();
+                            cmd.Dispose();
                         }
                     }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                            "[ASSETS DB]: " +
+                            "MySql failure updating access_time for asset {0} with name {1}" + Environment.NewLine + e.ToString()
+                            + Environment.NewLine + "Attempting reconnection", asset.FullID, asset.Name);
+                    }
                 }
             }
+
         }
 
         /// <summary>
@@ -307,41 +310,35 @@ namespace OpenSim.Data.MySQL
                 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                 {
                     dbcon.Open();
+                    MySqlCommand cmd = new MySqlCommand("SELECT name,description,assetType,temporary,id,asset_flags,CreatorID FROM assets LIMIT ?start, ?count", dbcon);
+                    cmd.Parameters.AddWithValue("?start", start);
+                    cmd.Parameters.AddWithValue("?count", count);
 
-                    using (MySqlCommand cmd
-                        = new MySqlCommand(
-                            "SELECT name,description,assetType,temporary,id,asset_flags,CreatorID FROM assets LIMIT ?start, ?count",
-                            dbcon))
+                    try
                     {
-                        cmd.Parameters.AddWithValue("?start", start);
-                        cmd.Parameters.AddWithValue("?count", count);
-    
-                        try
+                        using (MySqlDataReader dbReader = cmd.ExecuteReader())
                         {
-                            using (MySqlDataReader dbReader = cmd.ExecuteReader())
+                            while (dbReader.Read())
                             {
-                                while (dbReader.Read())
-                                {
-                                    AssetMetadata metadata = new AssetMetadata();
-                                    metadata.Name = (string)dbReader["name"];
-                                    metadata.Description = (string)dbReader["description"];
-                                    metadata.Type = (sbyte)dbReader["assetType"];
-                                    metadata.Temporary = Convert.ToBoolean(dbReader["temporary"]); // Not sure if this is correct.
-                                    metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]);
-                                    metadata.FullID = DBGuid.FromDB(dbReader["id"]);
-                                    metadata.CreatorID = dbReader["CreatorID"].ToString();
-    
-                                    // Current SHA1s are not stored/computed.
-                                    metadata.SHA1 = new byte[] { };
-    
-                                    retList.Add(metadata);
-                                }
+                                AssetMetadata metadata = new AssetMetadata();
+                                metadata.Name = (string)dbReader["name"];
+                                metadata.Description = (string)dbReader["description"];
+                                metadata.Type = (sbyte)dbReader["assetType"];
+                                metadata.Temporary = Convert.ToBoolean(dbReader["temporary"]); // Not sure if this is correct.
+                                metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]);
+                                metadata.FullID = DBGuid.FromDB(dbReader["id"]);
+                                metadata.CreatorID = dbReader["CreatorID"].ToString();
+
+                                // Current SHA1s are not stored/computed.
+                                metadata.SHA1 = new byte[] { };
+
+                                retList.Add(metadata);
                             }
                         }
-                        catch (Exception e)
-                        {
-                            m_log.Error("[ASSETS DB]: MySql failure fetching asset set" + Environment.NewLine + e.ToString());
-                        }
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Error("[ASSETS DB]: MySql failure fetching asset set" + Environment.NewLine + e.ToString());
                     }
                 }
             }
@@ -356,12 +353,11 @@ namespace OpenSim.Data.MySQL
                 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                 {
                     dbcon.Open();
+                    MySqlCommand cmd = new MySqlCommand("delete from assets where id=?id", dbcon);
+                    cmd.Parameters.AddWithValue("?id", id);
+                    cmd.ExecuteNonQuery();
 
-                    using (MySqlCommand cmd = new MySqlCommand("delete from assets where id=?id", dbcon))
-                    {
-                        cmd.Parameters.AddWithValue("?id", id);
-                        cmd.ExecuteNonQuery();
-                    }
+                    cmd.Dispose();
                 }
             }
 
@@ -370,4 +366,4 @@ namespace OpenSim.Data.MySQL
 
         #endregion
     }
-}
+}

OpenSim/Data/MySQL/MySQLAuthenticationData.cs

@@ -70,52 +70,41 @@ namespace OpenSim.Data.MySQL
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
+                MySqlCommand cmd = new MySqlCommand("select * from `" + m_Realm + "` where UUID = ?principalID", dbcon);
+                cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
 
-                using (MySqlCommand cmd
-                    = new MySqlCommand("select * from `" + m_Realm + "` where UUID = ?principalID", dbcon))
+                IDataReader result = cmd.ExecuteReader();
+
+                if (result.Read())
                 {
-                    cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
+                    ret.PrincipalID = principalID;
 
-                    IDataReader result = cmd.ExecuteReader();
-    
-                    if (result.Read())
+                    if (m_ColumnNames == null)
                     {
-                        ret.PrincipalID = principalID;
-    
-                        CheckColumnNames(result);
-    
-                        foreach (string s in m_ColumnNames)
-                        {
-                            if (s == "UUID")
-                                continue;
-    
-                            ret.Data[s] = result[s].ToString();
-                        }
-    
-                        return ret;
+                        m_ColumnNames = new List<string>();
+
+                        DataTable schemaTable = result.GetSchemaTable();
+                        foreach (DataRow row in schemaTable.Rows)
+                            m_ColumnNames.Add(row["ColumnName"].ToString());
                     }
-                    else
+
+                    foreach (string s in m_ColumnNames)
                     {
-                        return null;
+                        if (s == "UUID")
+                            continue;
+
+                        ret.Data[s] = result[s].ToString();
                     }
+
+                    return ret;
+                }
+                else
+                {
+                    return null;
                 }
             }
         }
 
-        private void CheckColumnNames(IDataReader result)
-        {
-            if (m_ColumnNames != null)
-                return;
-
-            List<string> columnNames = new List<string>();
-
-            DataTable schemaTable = result.GetSchemaTable();
-            foreach (DataRow row in schemaTable.Rows)
-                columnNames.Add(row["ColumnName"].ToString());
-
-            m_ColumnNames = columnNames;
-        }
-
         public bool Store(AuthenticationData data)
         {
             if (data.Data.ContainsKey("UUID"))
@@ -123,53 +112,57 @@ namespace OpenSim.Data.MySQL
 
             string[] fields = new List<string>(data.Data.Keys).ToArray();
 
-            using (MySqlCommand cmd = new MySqlCommand())
+            MySqlCommand cmd = new MySqlCommand();
+
+            string update = "update `"+m_Realm+"` set ";
+            bool first = true;
+            foreach (string field in fields)
             {
-                string update = "update `"+m_Realm+"` set ";
-                bool first = true;
-                foreach (string field in fields)
-                {
-                    if (!first)
-                        update += ", ";
-                    update += "`" + field + "` = ?"+field;
-    
-                    first = false;
-    
-                    cmd.Parameters.AddWithValue("?"+field, data.Data[field]);
-                }
-    
-                update += " where UUID = ?principalID";
-    
-                cmd.CommandText = update;
-                cmd.Parameters.AddWithValue("?principalID", data.PrincipalID.ToString());
-    
+                if (!first)
+                    update += ", ";
+                update += "`" + field + "` = ?"+field;
+
+                first = false;
+
+                cmd.Parameters.AddWithValue("?"+field, data.Data[field]);
+            }
+
+            update += " where UUID = ?principalID";
+
+            cmd.CommandText = update;
+            cmd.Parameters.AddWithValue("?principalID", data.PrincipalID.ToString());
+
+            if (ExecuteNonQuery(cmd) < 1)
+            {
+                string insert = "insert into `" + m_Realm + "` (`UUID`, `" +
+                        String.Join("`, `", fields) +
+                        "`) values (?principalID, ?" + String.Join(", ?", fields) + ")";
+
+                cmd.CommandText = insert;
+
                 if (ExecuteNonQuery(cmd) < 1)
                 {
-                    string insert = "insert into `" + m_Realm + "` (`UUID`, `" +
-                            String.Join("`, `", fields) +
-                            "`) values (?principalID, ?" + String.Join(", ?", fields) + ")";
-    
-                    cmd.CommandText = insert;
-    
-                    if (ExecuteNonQuery(cmd) < 1)
-                        return false;
+                    cmd.Dispose();
+                    return false;
                 }
             }
 
+            cmd.Dispose();
+
             return true;
         }
 
         public bool SetDataItem(UUID principalID, string item, string value)
         {
-            using (MySqlCommand cmd
-                = new MySqlCommand("update `" + m_Realm + "` set `" + item + "` = ?" + item + " where UUID = ?UUID"))
-            {
-                cmd.Parameters.AddWithValue("?"+item, value);
-                cmd.Parameters.AddWithValue("?UUID", principalID.ToString());
-    
-                if (ExecuteNonQuery(cmd) > 0)
-                    return true;
-            }
+            MySqlCommand cmd = new MySqlCommand("update `" + m_Realm +
+                    "` set `" + item + "` = ?" + item + " where UUID = ?UUID");
+
+
+            cmd.Parameters.AddWithValue("?"+item, value);
+            cmd.Parameters.AddWithValue("?UUID", principalID.ToString());
+
+            if (ExecuteNonQuery(cmd) > 0)
+                return true;
 
             return false;
         }
@@ -179,18 +172,18 @@ namespace OpenSim.Data.MySQL
             if (System.Environment.TickCount - m_LastExpire > 30000)
                 DoExpire();
 
-            using (MySqlCommand cmd
-                = new MySqlCommand(
-                    "insert into tokens (UUID, token, validity) values (?principalID, ?token, date_add(now(), interval ?lifetime minute))"))
+            MySqlCommand cmd = new MySqlCommand("insert into tokens (UUID, token, validity) values (?principalID, ?token, date_add(now(), interval ?lifetime minute))");
+            cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
+            cmd.Parameters.AddWithValue("?token", token);
+            cmd.Parameters.AddWithValue("?lifetime", lifetime.ToString());
+
+            if (ExecuteNonQuery(cmd) > 0)
             {
-                cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
-                cmd.Parameters.AddWithValue("?token", token);
-                cmd.Parameters.AddWithValue("?lifetime", lifetime.ToString());
-    
-                if (ExecuteNonQuery(cmd) > 0)
-                    return true;
+                cmd.Dispose();
+                return true;
             }
 
+            cmd.Dispose();
             return false;
         }
 
@@ -199,29 +192,30 @@ namespace OpenSim.Data.MySQL
             if (System.Environment.TickCount - m_LastExpire > 30000)
                 DoExpire();
 
-            using (MySqlCommand cmd
-                = new MySqlCommand(
-                    "update tokens set validity = date_add(now(), interval ?lifetime minute) where UUID = ?principalID and token = ?token and validity > now()"))
-            {
-                cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
-                cmd.Parameters.AddWithValue("?token", token);
-                cmd.Parameters.AddWithValue("?lifetime", lifetime.ToString());
+            MySqlCommand cmd = new MySqlCommand("update tokens set validity = date_add(now(), interval ?lifetime minute) where UUID = ?principalID and token = ?token and validity > now()");
+            cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
+            cmd.Parameters.AddWithValue("?token", token);
+            cmd.Parameters.AddWithValue("?lifetime", lifetime.ToString());
 
-                if (ExecuteNonQuery(cmd) > 0)
-                    return true;
+            if (ExecuteNonQuery(cmd) > 0)
+            {
+                cmd.Dispose();
+                return true;
             }
 
+            cmd.Dispose();
+
             return false;
         }
 
         private void DoExpire()
         {
-            using (MySqlCommand cmd = new MySqlCommand("delete from tokens where validity < now()"))
-            {
-                ExecuteNonQuery(cmd);
-            }
+            MySqlCommand cmd = new MySqlCommand("delete from tokens where validity < now()");
+            ExecuteNonQuery(cmd);
+
+            cmd.Dispose();
 
             m_LastExpire = System.Environment.TickCount;
         }
     }
-}
+}

OpenSim/Data/MySQL/MySQLAvatarData.cs

@@ -52,15 +52,14 @@ namespace OpenSim.Data.MySQL
 
         public bool Delete(UUID principalID, string name)
         {
-            using (MySqlCommand cmd = new MySqlCommand())
-            {
-                cmd.CommandText = String.Format("delete from {0} where `PrincipalID` = ?PrincipalID and `Name` = ?Name", m_Realm);
-                cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
-                cmd.Parameters.AddWithValue("?Name", name);
-    
-                if (ExecuteNonQuery(cmd) > 0)
-                    return true;
-            }
+            MySqlCommand cmd = new MySqlCommand();
+
+            cmd.CommandText = String.Format("delete from {0} where `PrincipalID` = ?PrincipalID and `Name` = ?Name", m_Realm);
+            cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
+            cmd.Parameters.AddWithValue("?Name", name);
+
+            if (ExecuteNonQuery(cmd) > 0)
+                return true;
 
             return false;
         }

OpenSim/Data/MySQL/MySQLEstateData.cs

@@ -210,6 +210,7 @@ namespace OpenSim.Data.MySQL
             }
 
             LoadBanList(es);
+
             es.EstateManagers = LoadUUIDList(es.EstateID, "estate_managers");
             es.EstateAccess = LoadUUIDList(es.EstateID, "estate_users");
             es.EstateGroups = LoadUUIDList(es.EstateID, "estate_groups");

OpenSim/Data/MySQL/MySQLFriendsData.cs

@@ -49,38 +49,34 @@ namespace OpenSim.Data.MySQL
 
         public bool Delete(string principalID, string friend)
         {
-            using (MySqlCommand cmd = new MySqlCommand())
-            {
-                cmd.CommandText = String.Format("delete from {0} where PrincipalID = ?PrincipalID and Friend = ?Friend", m_Realm);
-                cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
-                cmd.Parameters.AddWithValue("?Friend", friend);
+            MySqlCommand cmd = new MySqlCommand();
 
-                ExecuteNonQuery(cmd);
-            }
+            cmd.CommandText = String.Format("delete from {0} where PrincipalID = ?PrincipalID and Friend = ?Friend", m_Realm);
+            cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
+            cmd.Parameters.AddWithValue("?Friend", friend);
+
+            ExecuteNonQuery(cmd);
 
             return true;
         }
 
         public FriendsData[] GetFriends(UUID principalID)
         {
-            using (MySqlCommand cmd = new MySqlCommand())
-            {
-                cmd.CommandText = String.Format("select a.*,case when b.Flags is null then -1 else b.Flags end as TheirFlags from {0} as a left join {0} as b on a.PrincipalID = b.Friend and a.Friend = b.PrincipalID where a.PrincipalID = ?PrincipalID", m_Realm);
-                cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
+            MySqlCommand cmd = new MySqlCommand();
 
-                return DoQuery(cmd);
-            }
+            cmd.CommandText = String.Format("select a.*,case when b.Flags is null then -1 else b.Flags end as TheirFlags from {0} as a left join {0} as b on a.PrincipalID = b.Friend and a.Friend = b.PrincipalID where a.PrincipalID = ?PrincipalID", m_Realm);
+            cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
+
+            return DoQuery(cmd);
         }
 
         public FriendsData[] GetFriends(string principalID)
         {
-            using (MySqlCommand cmd = new MySqlCommand())
-            {
-                cmd.CommandText = String.Format("select a.*,case when b.Flags is null then -1 else b.Flags end as TheirFlags from {0} as a left join {0} as b on a.PrincipalID = b.Friend and a.Friend = b.PrincipalID where a.PrincipalID LIKE ?PrincipalID", m_Realm);
-                cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString() + '%');
+            MySqlCommand cmd = new MySqlCommand();
 
-                return DoQuery(cmd);
-            }
+            cmd.CommandText = String.Format("select a.*,case when b.Flags is null then -1 else b.Flags end as TheirFlags from {0} as a left join {0} as b on a.PrincipalID = b.Friend and a.Friend = b.PrincipalID where a.PrincipalID LIKE ?PrincipalID", m_Realm);
+            cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString() + '%');
+            return DoQuery(cmd);
         }
     }
-}
+}

OpenSim/Data/MySQL/MySQLGenericTableHandler.cs

@@ -91,17 +91,15 @@ namespace OpenSim.Data.MySQL
             if (m_ColumnNames != null)
                 return;
 
-            List<string> columnNames = new List<string>();
+            m_ColumnNames = new List<string>();
 
             DataTable schemaTable = reader.GetSchemaTable();
             foreach (DataRow row in schemaTable.Rows)
             {
                 if (row["ColumnName"] != null &&
                         (!m_Fields.ContainsKey(row["ColumnName"].ToString())))
-                    columnNames.Add(row["ColumnName"].ToString());
+                    m_ColumnNames.Add(row["ColumnName"].ToString());
             }
-
-            m_ColumnNames = columnNames;
         }
 
         public virtual T[] Get(string field, string key)

OpenSim/Data/MySQL/MySQLInventoryData.cs

@@ -467,43 +467,43 @@ namespace OpenSim.Data.MySQL
                 {
                     dbcon.Open();
 
-                    using (MySqlCommand result = new MySqlCommand(sql, dbcon))
+                    MySqlCommand result = new MySqlCommand(sql, dbcon);
+                    result.Parameters.AddWithValue("?inventoryID", item.ID.ToString());
+                    result.Parameters.AddWithValue("?assetID", item.AssetID.ToString());
+                    result.Parameters.AddWithValue("?assetType", item.AssetType.ToString());
+                    result.Parameters.AddWithValue("?parentFolderID", item.Folder.ToString());
+                    result.Parameters.AddWithValue("?avatarID", item.Owner.ToString());
+                    result.Parameters.AddWithValue("?inventoryName", itemName);
+                    result.Parameters.AddWithValue("?inventoryDescription", itemDesc);
+                    result.Parameters.AddWithValue("?inventoryNextPermissions", item.NextPermissions.ToString());
+                    result.Parameters.AddWithValue("?inventoryCurrentPermissions",
+                                                   item.CurrentPermissions.ToString());
+                    result.Parameters.AddWithValue("?invType", item.InvType);
+                    result.Parameters.AddWithValue("?creatorID", item.CreatorId);
+                    result.Parameters.AddWithValue("?inventoryBasePermissions", item.BasePermissions);
+                    result.Parameters.AddWithValue("?inventoryEveryOnePermissions", item.EveryOnePermissions);
+                    result.Parameters.AddWithValue("?inventoryGroupPermissions", item.GroupPermissions);
+                    result.Parameters.AddWithValue("?salePrice", item.SalePrice);
+                    result.Parameters.AddWithValue("?saleType", unchecked((sbyte)item.SaleType));
+                    result.Parameters.AddWithValue("?creationDate", item.CreationDate);
+                    result.Parameters.AddWithValue("?groupID", item.GroupID);
+                    result.Parameters.AddWithValue("?groupOwned", item.GroupOwned);
+                    result.Parameters.AddWithValue("?flags", item.Flags);
+
+                    lock (m_dbLock)
                     {
-                        result.Parameters.AddWithValue("?inventoryID", item.ID.ToString());
-                        result.Parameters.AddWithValue("?assetID", item.AssetID.ToString());
-                        result.Parameters.AddWithValue("?assetType", item.AssetType.ToString());
-                        result.Parameters.AddWithValue("?parentFolderID", item.Folder.ToString());
-                        result.Parameters.AddWithValue("?avatarID", item.Owner.ToString());
-                        result.Parameters.AddWithValue("?inventoryName", itemName);
-                        result.Parameters.AddWithValue("?inventoryDescription", itemDesc);
-                        result.Parameters.AddWithValue("?inventoryNextPermissions", item.NextPermissions.ToString());
-                        result.Parameters.AddWithValue("?inventoryCurrentPermissions",
-                                                       item.CurrentPermissions.ToString());
-                        result.Parameters.AddWithValue("?invType", item.InvType);
-                        result.Parameters.AddWithValue("?creatorID", item.CreatorId);
-                        result.Parameters.AddWithValue("?inventoryBasePermissions", item.BasePermissions);
-                        result.Parameters.AddWithValue("?inventoryEveryOnePermissions", item.EveryOnePermissions);
-                        result.Parameters.AddWithValue("?inventoryGroupPermissions", item.GroupPermissions);
-                        result.Parameters.AddWithValue("?salePrice", item.SalePrice);
-                        result.Parameters.AddWithValue("?saleType", unchecked((sbyte)item.SaleType));
-                        result.Parameters.AddWithValue("?creationDate", item.CreationDate);
-                        result.Parameters.AddWithValue("?groupID", item.GroupID);
-                        result.Parameters.AddWithValue("?groupOwned", item.GroupOwned);
-                        result.Parameters.AddWithValue("?flags", item.Flags);
-    
-                        lock (m_dbLock)
-                            result.ExecuteNonQuery();
-    
-                        result.Dispose();
+                        result.ExecuteNonQuery();
                     }
 
-                    using (MySqlCommand result = new MySqlCommand("update inventoryfolders set version=version+1 where folderID = ?folderID", dbcon))
-                    {
-                        result.Parameters.AddWithValue("?folderID", item.Folder.ToString());
+                    result.Dispose();
 
-                        lock (m_dbLock)
-                            result.ExecuteNonQuery();
+                    result = new MySqlCommand("update inventoryfolders set version=version+1 where folderID = ?folderID", dbcon);
+                    result.Parameters.AddWithValue("?folderID", item.Folder.ToString());
+                    lock (m_dbLock)
+                    {
+                        result.ExecuteNonQuery();
                     }
+                    result.Dispose();
                 }
             }
             catch (MySqlException e)
@@ -533,12 +533,12 @@ namespace OpenSim.Data.MySQL
                 {
                     dbcon.Open();
 
-                    using (MySqlCommand cmd = new MySqlCommand("DELETE FROM inventoryitems WHERE inventoryID=?uuid", dbcon))
-                    {
-                        cmd.Parameters.AddWithValue("?uuid", itemID.ToString());
+                    MySqlCommand cmd = new MySqlCommand("DELETE FROM inventoryitems WHERE inventoryID=?uuid", dbcon);
+                    cmd.Parameters.AddWithValue("?uuid", itemID.ToString());
 
-                        lock (m_dbLock)
-                            cmd.ExecuteNonQuery();
+                    lock (m_dbLock)
+                    {
+                        cmd.ExecuteNonQuery();
                     }
                 }
             }
@@ -579,27 +579,25 @@ namespace OpenSim.Data.MySQL
             {
                 dbcon.Open();
 
-                using (MySqlCommand cmd = new MySqlCommand(sql, dbcon))
-                {
-                    cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString());
-                    cmd.Parameters.AddWithValue("?agentID", folder.Owner.ToString());
-                    cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString());
-                    cmd.Parameters.AddWithValue("?folderName", folderName);
-                    cmd.Parameters.AddWithValue("?type", folder.Type);
-                    cmd.Parameters.AddWithValue("?version", folder.Version);
+                MySqlCommand cmd = new MySqlCommand(sql, dbcon);
+                cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString());
+                cmd.Parameters.AddWithValue("?agentID", folder.Owner.ToString());
+                cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString());
+                cmd.Parameters.AddWithValue("?folderName", folderName);
+                cmd.Parameters.AddWithValue("?type", folder.Type);
+                cmd.Parameters.AddWithValue("?version", folder.Version);
 
-                    try
+                try
+                {
+                    lock (m_dbLock)
                     {
-                        lock (m_dbLock)
-                        {
-                            cmd.ExecuteNonQuery();
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.Error(e.ToString());
+                        cmd.ExecuteNonQuery();
                     }
                 }
+                catch (Exception e)
+                {
+                    m_log.Error(e.ToString());
+                }
             }
         }
 
@@ -626,23 +624,21 @@ namespace OpenSim.Data.MySQL
             {
                 dbcon.Open();
 
-                using (MySqlCommand cmd = new MySqlCommand(sql, dbcon))
+                MySqlCommand cmd = new MySqlCommand(sql, dbcon);
+                cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString());
+                cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString());
+
+                try
                 {
-                    cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString());
-                    cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString());
-    
-                    try
+                    lock (m_dbLock)
                     {
-                        lock (m_dbLock)
-                        {
-                            cmd.ExecuteNonQuery();
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.Error(e.ToString());
+                        cmd.ExecuteNonQuery();
                     }
                 }
+                catch (Exception e)
+                {
+                    m_log.Error(e.ToString());
+                }
             }
         }
 

OpenSim/Data/MySQL/MySQLPresenceData.cs

@@ -63,14 +63,13 @@ namespace OpenSim.Data.MySQL
 
         public void LogoutRegionAgents(UUID regionID)
         {
-            using (MySqlCommand cmd = new MySqlCommand())
-            {
-                cmd.CommandText = String.Format("delete from {0} where `RegionID`=?RegionID", m_Realm);
-    
-                cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
-    
-                ExecuteNonQuery(cmd);
-            }
+            MySqlCommand cmd = new MySqlCommand();
+
+            cmd.CommandText = String.Format("delete from {0} where `RegionID`=?RegionID", m_Realm);
+
+            cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
+
+            ExecuteNonQuery(cmd);
         }
 
         public bool ReportAgent(UUID sessionID, UUID regionID)
@@ -82,18 +81,17 @@ namespace OpenSim.Data.MySQL
             if (regionID == UUID.Zero)
                 return false;
 
-            using (MySqlCommand cmd = new MySqlCommand())
-            {
-                cmd.CommandText = String.Format("update {0} set RegionID=?RegionID, LastSeen=NOW() where `SessionID`=?SessionID", m_Realm);
-    
-                cmd.Parameters.AddWithValue("?SessionID", sessionID.ToString());
-                cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
-    
-                if (ExecuteNonQuery(cmd) == 0)
-                    return false;
-            }
+            MySqlCommand cmd = new MySqlCommand();
+
+            cmd.CommandText = String.Format("update {0} set RegionID=?RegionID, LastSeen=NOW() where `SessionID`=?SessionID", m_Realm);
+
+            cmd.Parameters.AddWithValue("?SessionID", sessionID.ToString());
+            cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
+
+            if (ExecuteNonQuery(cmd) == 0)
+                return false;
 
             return true;
         }
     }
-}
+}

OpenSim/Data/MySQL/MySQLRegionData.cs

@@ -162,7 +162,17 @@ namespace OpenSim.Data.MySQL
                         ret.sizeX = Convert.ToInt32(result["sizeX"]);
                         ret.sizeY = Convert.ToInt32(result["sizeY"]);
 
-                        CheckColumnNames(result);
+                        if (m_ColumnNames == null)
+                        {
+                            m_ColumnNames = new List<string>();
+
+                            DataTable schemaTable = result.GetSchemaTable();
+                            foreach (DataRow row in schemaTable.Rows)
+                            {
+                                if (row["ColumnName"] != null)
+                                    m_ColumnNames.Add(row["ColumnName"].ToString());
+                            }
+                        }
 
                         foreach (string s in m_ColumnNames)
                         {
@@ -177,11 +187,7 @@ namespace OpenSim.Data.MySQL
                             if (s == "locY")
                                 continue;
 
-                            object value = result[s];
-                            if (value is DBNull)
-                                ret.Data[s] = null;
-                            else
-                                ret.Data[s] = result[s].ToString();
+                            ret.Data[s] = result[s].ToString();
                         }
 
                         retList.Add(ret);
@@ -192,23 +198,6 @@ namespace OpenSim.Data.MySQL
             return retList;
         }
 
-        private void CheckColumnNames(IDataReader result)
-        {
-            if (m_ColumnNames != null)
-                return;
-
-            List<string> columnNames = new List<string>();
-
-            DataTable schemaTable = result.GetSchemaTable();
-            foreach (DataRow row in schemaTable.Rows)
-            {
-                if (row["ColumnName"] != null)
-                    columnNames.Add(row["ColumnName"].ToString());
-            }
-
-            m_ColumnNames = columnNames;
-        }
-
         public bool Store(RegionData data)
         {
             if (data.Data.ContainsKey("uuid"))
@@ -329,12 +318,11 @@ namespace OpenSim.Data.MySQL
             if (scopeID != UUID.Zero)
                 command += " and ScopeID = ?scopeID";
 
-            using (MySqlCommand cmd = new MySqlCommand(command))
-            {
-                cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
-    
-                return RunCommand(cmd);
-            }
+            MySqlCommand cmd = new MySqlCommand(command);
+
+            cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
+
+            return RunCommand(cmd);
         }
     }
-}
+}

OpenSim/Data/MySQL/MySQLUserAccountData.cs

@@ -62,24 +62,23 @@ namespace OpenSim.Data.MySQL
             if (words.Length > 2)
                 return new UserAccountData[0];
 
-            using (MySqlCommand cmd = new MySqlCommand())
-            {
-                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);
-                    cmd.Parameters.AddWithValue("?search", "%" + words[0] + "%");
-                    cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
-                }
-                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.AddWithValue("?searchFirst", "%" + words[0] + "%");
-                    cmd.Parameters.AddWithValue("?searchLast", "%" + words[1] + "%");
-                    cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
-                }
+            MySqlCommand cmd = new MySqlCommand();
 
-                return DoQuery(cmd);
+            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);
+                cmd.Parameters.AddWithValue("?search", "%" + words[0] + "%");
+                cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
             }
+            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.AddWithValue("?searchFirst", "%" + words[0] + "%");
+                cmd.Parameters.AddWithValue("?searchLast", "%" + words[1] + "%");
+                cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
+            }
+
+            return DoQuery(cmd);
         }
     }
-}
+}

OpenSim/Data/MySQL/MySQLXAssetData.cs

@@ -1,500 +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.Data;
-using System.IO;
-using System.IO.Compression;
-using System.Reflection;
-using System.Security.Cryptography;
-using System.Text;
-using log4net;
-using MySql.Data.MySqlClient;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Data;
-
-namespace OpenSim.Data.MySQL
-{
-    public class MySQLXAssetData : IXAssetDataPlugin
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        protected virtual Assembly Assembly
-        {
-            get { return GetType().Assembly; }
-        }
-
-        private bool m_enableCompression = false;
-        private string m_connectionString;
-        private object m_dbLock = new object();
-
-        /// <summary>
-        /// We can reuse this for all hashing since all methods are single-threaded through m_dbBLock
-        /// </summary>
-        private HashAlgorithm hasher = new SHA256CryptoServiceProvider();
-
-        #region IPlugin Members
-
-        public string Version { get { return "1.0.0.0"; } }
-
-        /// <summary>
-        /// <para>Initialises Asset interface</para>
-        /// <para>
-        /// <list type="bullet">
-        /// <item>Loads and initialises the MySQL storage plugin.</item>
-        /// <item>Warns and uses the obsolete mysql_connection.ini if connect string is empty.</item>
-        /// <item>Check for migration</item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        /// <param name="connect">connect string</param>
-        public void Initialise(string connect)
-        {
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: ***********************************************************");
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: ***********************************************************");
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: ***********************************************************");
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: THIS PLUGIN IS STRICTLY EXPERIMENTAL.");
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: DO NOT USE FOR ANY DATA THAT YOU DO NOT MIND LOSING.");
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: DATABASE TABLES CAN CHANGE AT ANY TIME, CAUSING EXISTING DATA TO BE LOST.");
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: ***********************************************************");
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: ***********************************************************");
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: ***********************************************************");
-
-            m_connectionString = connect;
-
-            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-            {
-                dbcon.Open();
-                Migration m = new Migration(dbcon, Assembly, "XAssetStore");
-                m.Update();
-            }
-        }
-
-        public void Initialise()
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Dispose() { }
-
-        /// <summary>
-        /// The name of this DB provider
-        /// </summary>
-        public string Name
-        {
-            get { return "MySQL XAsset storage engine"; }
-        }
-
-        #endregion
-
-        #region IAssetDataPlugin Members
-
-        /// <summary>
-        /// Fetch Asset <paramref name="assetID"/> from database
-        /// </summary>
-        /// <param name="assetID">Asset UUID to fetch</param>
-        /// <returns>Return the asset</returns>
-        /// <remarks>On failure : throw an exception and attempt to reconnect to database</remarks>
-        public AssetBase GetAsset(UUID assetID)
-        {
-//            m_log.DebugFormat("[MYSQL XASSET DATA]: Looking for asset {0}", assetID);
-
-            AssetBase asset = null;
-            lock (m_dbLock)
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (MySqlCommand cmd = new MySqlCommand(
-                        "SELECT name, description, asset_type, local, temporary, asset_flags, creator_id, data FROM xassetsmeta JOIN xassetsdata ON xassetsmeta.hash = xassetsdata.hash WHERE id=?id",
-                        dbcon))
-                    {
-                        cmd.Parameters.AddWithValue("?id", assetID.ToString());
-
-                        try
-                        {
-                            using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
-                            {
-                                if (dbReader.Read())
-                                {
-                                    asset = new AssetBase(assetID, (string)dbReader["name"], (sbyte)dbReader["asset_type"], dbReader["creator_id"].ToString());
-                                    asset.Data = (byte[])dbReader["data"];
-                                    asset.Description = (string)dbReader["description"];
-
-                                    string local = dbReader["local"].ToString();
-                                    if (local.Equals("1") || local.Equals("true", StringComparison.InvariantCultureIgnoreCase))
-                                        asset.Local = true;
-                                    else
-                                        asset.Local = false;
-
-                                    asset.Temporary = Convert.ToBoolean(dbReader["temporary"]);
-                                    asset.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]);
-
-                                    if (m_enableCompression)
-                                    {
-                                        using (GZipStream decompressionStream = new GZipStream(new MemoryStream(asset.Data), CompressionMode.Decompress))
-                                        {
-                                            MemoryStream outputStream = new MemoryStream();
-                                            WebUtil.CopyStream(decompressionStream, outputStream, int.MaxValue);
-    //                                        int compressedLength = asset.Data.Length;
-                                            asset.Data = outputStream.ToArray();
-    
-    //                                        m_log.DebugFormat(
-    //                                            "[XASSET DB]: Decompressed {0} {1} to {2} bytes from {3}",
-    //                                            asset.ID, asset.Name, asset.Data.Length, compressedLength);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.Error("[MYSQL XASSET DATA]: MySql failure fetching asset " + assetID + ": " + e.Message);
-                        }
-                    }
-                }
-            }
-
-            return asset;
-        }
-
-        /// <summary>
-        /// Create an asset in database, or update it if existing.
-        /// </summary>
-        /// <param name="asset">Asset UUID to create</param>
-        /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks>
-        public void StoreAsset(AssetBase asset)
-        {
-            lock (m_dbLock)
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (MySqlTransaction transaction = dbcon.BeginTransaction())
-                    {
-                        string assetName = asset.Name;
-                        if (asset.Name.Length > 64)
-                        {
-                            assetName = asset.Name.Substring(0, 64);
-                            m_log.Warn("[XASSET DB]: Name field truncated from " + asset.Name.Length + " to " + assetName.Length + " characters on add");
-                        }
-    
-                        string assetDescription = asset.Description;
-                        if (asset.Description.Length > 64)
-                        {
-                            assetDescription = asset.Description.Substring(0, 64);
-                            m_log.Warn("[XASSET DB]: Description field truncated from " + asset.Description.Length + " to " + assetDescription.Length + " characters on add");
-                        }
-
-                        if (m_enableCompression)
-                        {
-                            MemoryStream outputStream = new MemoryStream();
-
-                            using (GZipStream compressionStream = new GZipStream(outputStream, CompressionMode.Compress, false))
-                            {
-    //                            Console.WriteLine(WebUtil.CopyTo(new MemoryStream(asset.Data), compressionStream, int.MaxValue));
-                                // We have to close the compression stream in order to make sure it writes everything out to the underlying memory output stream.
-                                compressionStream.Close();
-                                byte[] compressedData = outputStream.ToArray();
-                                asset.Data = compressedData;
-                            }
-                        }
-
-                        byte[] hash = hasher.ComputeHash(asset.Data);
-
-//                        m_log.DebugFormat(
-//                            "[XASSET DB]: Compressed data size for {0} {1}, hash {2} is {3}",
-//                            asset.ID, asset.Name, hash, compressedData.Length);
-
-                        try
-                        {
-                            using (MySqlCommand cmd =
-                                new MySqlCommand(
-                                    "replace INTO xassetsmeta(id, hash, name, description, asset_type, local, temporary, create_time, access_time, asset_flags, creator_id)" +
-                                    "VALUES(?id, ?hash, ?name, ?description, ?asset_type, ?local, ?temporary, ?create_time, ?access_time, ?asset_flags, ?creator_id)",
-                                    dbcon))
-                            {
-                                // create unix epoch time
-                                int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
-                                cmd.Parameters.AddWithValue("?id", asset.ID);
-                                cmd.Parameters.AddWithValue("?hash", hash);
-                                cmd.Parameters.AddWithValue("?name", assetName);
-                                cmd.Parameters.AddWithValue("?description", assetDescription);
-                                cmd.Parameters.AddWithValue("?asset_type", asset.Type);
-                                cmd.Parameters.AddWithValue("?local", asset.Local);
-                                cmd.Parameters.AddWithValue("?temporary", asset.Temporary);
-                                cmd.Parameters.AddWithValue("?create_time", now);
-                                cmd.Parameters.AddWithValue("?access_time", now);
-                                cmd.Parameters.AddWithValue("?creator_id", asset.Metadata.CreatorID);
-                                cmd.Parameters.AddWithValue("?asset_flags", (int)asset.Flags);
-                                cmd.ExecuteNonQuery();
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset metadata {0} with name \"{1}\". Error: {2}",
-                                asset.FullID, asset.Name, e.Message);
-
-                            transaction.Rollback();
-
-                            return;
-                        }
-
-                        if (!ExistsData(dbcon, transaction, hash))
-                        {
-                            try
-                            {
-                                using (MySqlCommand cmd =
-                                    new MySqlCommand(
-                                        "INSERT INTO xassetsdata(hash, data) VALUES(?hash, ?data)",
-                                        dbcon))
-                                {
-                                    cmd.Parameters.AddWithValue("?hash", hash);
-                                    cmd.Parameters.AddWithValue("?data", asset.Data);
-                                    cmd.ExecuteNonQuery();
-                                }
-                            }
-                            catch (Exception e)
-                            {
-                                m_log.ErrorFormat("[XASSET DB]: MySQL failure creating asset data {0} with name \"{1}\". Error: {2}",
-                                    asset.FullID, asset.Name, e.Message);
-    
-                                transaction.Rollback();
-    
-                                return;
-                            }
-                        }
-    
-                        transaction.Commit();
-                    }
-                }
-            }
-        }
-
-//        private void UpdateAccessTime(AssetBase asset)
-//        {
-//            lock (m_dbLock)
-//            {
-//                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-//                {
-//                    dbcon.Open();
-//                    MySqlCommand cmd =
-//                        new MySqlCommand("update assets set access_time=?access_time where id=?id",
-//                                         dbcon);
-//
-//                    // need to ensure we dispose
-//                    try
-//                    {
-//                        using (cmd)
-//                        {
-//                            // create unix epoch time
-//                            int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
-//                            cmd.Parameters.AddWithValue("?id", asset.ID);
-//                            cmd.Parameters.AddWithValue("?access_time", now);
-//                            cmd.ExecuteNonQuery();
-//                            cmd.Dispose();
-//                        }
-//                    }
-//                    catch (Exception e)
-//                    {
-//                        m_log.ErrorFormat(
-//                            "[ASSETS DB]: " +
-//                            "MySql failure updating access_time for asset {0} with name {1}" + Environment.NewLine + e.ToString()
-//                            + Environment.NewLine + "Attempting reconnection", asset.FullID, asset.Name);
-//                    }
-//                }
-//            }
-//
-//        }
-
-        /// <summary>
-        /// We assume we already have the m_dbLock.
-        /// </summary>
-        /// TODO: need to actually use the transaction.
-        /// <param name="dbcon"></param>
-        /// <param name="transaction"></param>
-        /// <param name="hash"></param>
-        /// <returns></returns>
-        private bool ExistsData(MySqlConnection dbcon, MySqlTransaction transaction, byte[] hash)
-        {
-//            m_log.DebugFormat("[ASSETS DB]: Checking for asset {0}", uuid);
-
-            bool exists = false;
-
-            using (MySqlCommand cmd = new MySqlCommand("SELECT hash FROM xassetsdata WHERE hash=?hash", dbcon))
-            {
-                cmd.Parameters.AddWithValue("?hash", hash);
-
-                try
-                {
-                    using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
-                    {
-                        if (dbReader.Read())
-                        {
-//                                    m_log.DebugFormat("[ASSETS DB]: Found asset {0}", uuid);
-                            exists = true;
-                        }
-                    }
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat(
-                        "[XASSETS DB]: MySql failure in ExistsData fetching hash {0}.  Exception {1}{2}",
-                        hash, e.Message, e.StackTrace);
-                }
-            }
-
-            return exists;
-        }
-
-        /// <summary>
-        /// Check if the asset exists in the database
-        /// </summary>
-        /// <param name="uuid">The asset UUID</param>
-        /// <returns>true if it exists, false otherwise.</returns>
-        public bool ExistsAsset(UUID uuid)
-        {
-//            m_log.DebugFormat("[ASSETS DB]: Checking for asset {0}", uuid);
-
-            bool assetExists = false;
-
-            lock (m_dbLock)
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-                    using (MySqlCommand cmd = new MySqlCommand("SELECT id FROM xassetsmeta WHERE id=?id", dbcon))
-                    {
-                        cmd.Parameters.AddWithValue("?id", uuid.ToString());
-
-                        try
-                        {
-                            using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
-                            {
-                                if (dbReader.Read())
-                                {
-//                                    m_log.DebugFormat("[ASSETS DB]: Found asset {0}", uuid);
-                                    assetExists = true;
-                                }
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.ErrorFormat(
-                                "[XASSETS DB]: MySql failure fetching asset {0}" + Environment.NewLine + e.ToString(), uuid);
-                        }
-                    }
-                }
-            }
-
-            return assetExists;
-        }
-
-        /// <summary>
-        /// Returns a list of AssetMetadata objects. The list is a subset of
-        /// the entire data set offset by <paramref name="start" /> containing
-        /// <paramref name="count" /> elements.
-        /// </summary>
-        /// <param name="start">The number of results to discard from the total data set.</param>
-        /// <param name="count">The number of rows the returned list should contain.</param>
-        /// <returns>A list of AssetMetadata objects.</returns>
-        public List<AssetMetadata> FetchAssetMetadataSet(int start, int count)
-        {
-            List<AssetMetadata> retList = new List<AssetMetadata>(count);
-
-            lock (m_dbLock)
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-                    MySqlCommand cmd = new MySqlCommand("SELECT name,description,asset_type,temporary,id,asset_flags,creator_id FROM xassetsmeta LIMIT ?start, ?count", dbcon);
-                    cmd.Parameters.AddWithValue("?start", start);
-                    cmd.Parameters.AddWithValue("?count", count);
-
-                    try
-                    {
-                        using (MySqlDataReader dbReader = cmd.ExecuteReader())
-                        {
-                            while (dbReader.Read())
-                            {
-                                AssetMetadata metadata = new AssetMetadata();
-                                metadata.Name = (string)dbReader["name"];
-                                metadata.Description = (string)dbReader["description"];
-                                metadata.Type = (sbyte)dbReader["asset_type"];
-                                metadata.Temporary = Convert.ToBoolean(dbReader["temporary"]); // Not sure if this is correct.
-                                metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]);
-                                metadata.FullID = DBGuid.FromDB(dbReader["id"]);
-                                metadata.CreatorID = dbReader["creator_id"].ToString();
-
-                                // We'll ignore this for now - it appears unused!
-//                                metadata.SHA1 = dbReader["hash"]);
-
-                                retList.Add(metadata);
-                            }
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.Error("[XASSETS DB]: MySql failure fetching asset set" + Environment.NewLine + e.ToString());
-                    }
-                }
-            }
-
-            return retList;
-        }
-
-        public bool Delete(string id)
-        {
-//            m_log.DebugFormat("[XASSETS DB]: Deleting asset {0}", id);
-
-            lock (m_dbLock)
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (MySqlCommand cmd = new MySqlCommand("delete from xassetsmeta where id=?id", dbcon))
-                    {
-                        cmd.Parameters.AddWithValue("?id", id);
-                        cmd.ExecuteNonQuery();
-                    }
-
-                    // TODO: How do we deal with data from deleted assets?  Probably not easily reapable unless we
-                    // keep a reference count (?)
-                }
-            }
-
-            return true;
-        }
-
-        #endregion
-    }
-}

OpenSim/Data/MySQL/Resources/GridStore.migrations

@@ -94,12 +94,3 @@ BEGIN;
 alter table regions modify column regionName varchar(128) default NULL;
 
 COMMIT;
-
-:VERSION 9      # ------------
-
-BEGIN;
-
-alter table regions add column `parcelMapTexture` varchar(36) default NULL;
-
-COMMIT;
-

OpenSim/Data/MySQL/Resources/RegionStore.migrations

@@ -841,64 +841,4 @@ alter table regionban ENGINE = MyISAM;
 alter table regionsettings ENGINE = MyISAM;
 alter table terrain ENGINE = MyISAM;
 
-COMMIT;
-
-:VERSION 39        #--------------- Telehub support
-
-BEGIN;
-CREATE TABLE IF NOT EXISTS `spawn_points` (
-  `RegionID` varchar(36) COLLATE utf8_unicode_ci NOT NULL,
-  `Yaw` float NOT NULL,
-  `Pitch` float NOT NULL,
-  `Distance` float NOT NULL,
-  KEY `RegionID` (`RegionID`)
-) ENGINE=Innodb;
-
-ALTER TABLE `regionsettings` ADD COLUMN `TelehubObject` varchar(36) NOT NULL;
-COMMIT;
-
-:VERSION 40       #---------------- Parcels for sale
-
-BEGIN;
-ALTER TABLE `regionsettings` ADD COLUMN `parcel_tile_ID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
-COMMIT;
-
-:VERSION 41       #---------------- Timed bans/access
-
-BEGIN;
-ALTER TABLE `landaccesslist` ADD COLUMN `Expires` INTEGER NOT NULL DEFAULT 0;
-COMMIT;
-
-:VERSION 42       #--------------------- Region Covenant changed time
-
-BEGIN;
-ALTER TABLE regionsettings ADD COLUMN covenant_datetime int unsigned NOT NULL DEFAULT '0';
-COMMIT;
-
-:VERSION 43         #--------------------- 
-
-BEGIN;
-
-ALTER TABLE `regionsettings` MODIFY COLUMN `TelehubObject` VARCHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
-
-COMMIT;
-
-:VERSION 44         #--------------------- Environment Settings
-
-BEGIN;
-
-CREATE TABLE `regionenvironment` (
-  `region_id` varchar(36) NOT NULL,
-  `llsd_settings` TEXT NOT NULL,
-  PRIMARY KEY (`region_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-COMMIT;
-
-:VERSION 45
-
-BEGIN;
-
-CREATE TABLE `regionextra` (`RegionID` char(36) not null, `Name` varchar(32) not null, `value` text, primary key(`RegionID`, `Name`));
-
-COMMIT;
+COMMIT;

OpenSim/Data/MySQL/Resources/XAssetStore.migrations

@@ -1,27 +0,0 @@
-# -----------------
-:VERSION 1
-
-BEGIN;
-
-CREATE TABLE `xassetsmeta` (
-  `id` char(36) NOT NULL,
-  `hash` binary(32) NOT NULL,
-  `name` varchar(64) NOT NULL,
-  `description` varchar(64) NOT NULL,
-  `asset_type` tinyint(4) NOT NULL,
-  `local` tinyint(1) NOT NULL,
-  `temporary` tinyint(1) NOT NULL,
-  `create_time` int(11) NOT NULL,
-  `access_time` int(11) NOT NULL,
-  `asset_flags` int(11) NOT NULL,
-  `creator_id` varchar(128) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Version 1';
-
-CREATE TABLE `xassetsdata` (
-  `hash` binary(32) NOT NULL,
-  `data` longblob NOT NULL,
-  PRIMARY KEY (`hash`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Version 1';
-
-COMMIT;

OpenSim/Data/Null/NullFriendsData.cs

@@ -28,9 +28,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Reflection;
-using System.Threading;
-using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Data;
@@ -39,26 +36,12 @@ namespace OpenSim.Data.Null
 {
     public class NullFriendsData : IFriendsData
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
         private static List<FriendsData> m_Data = new List<FriendsData>();
 
         public NullFriendsData(string connectionString, string realm)
         {
         }
 
-        /// <summary>
-        /// Clear all friends data
-        /// </summary>
-        /// <remarks>
-        /// This is required by unit tests to clear the static data between test runs.
-        /// </remarks>
-        public static void Clear()
-        {
-            lock (m_Data)
-                m_Data.Clear();
-        }
-
         public FriendsData[] GetFriends(UUID principalID)
         {
             return GetFriends(principalID.ToString());
@@ -73,30 +56,20 @@ namespace OpenSim.Data.Null
         /// <returns></returns>
         public FriendsData[] GetFriends(string userID)
         {
-            lock (m_Data)
+            List<FriendsData> lst = m_Data.FindAll(fdata =>
             {
-                List<FriendsData> lst = m_Data.FindAll(fdata =>
+                return fdata.PrincipalID == userID.ToString();
+            });
+
+            if (lst != null)
+            {
+                lst.ForEach(f =>
                 {
-                    return fdata.PrincipalID == userID.ToString();
+                    FriendsData f2 = m_Data.Find(candidateF2 => f.Friend == candidateF2.PrincipalID);
+                    if (f2 != null) { f.Data["TheirFlags"] = f2.Data["Flags"]; }
                 });
-    
-                if (lst != null)
-                {
-                    lst.ForEach(f =>
-                    {
-                        FriendsData f2 = m_Data.Find(candidateF2 => f.Friend == candidateF2.PrincipalID);
-                        if (f2 != null)
-                            f.Data["TheirFlags"] = f2.Data["Flags"];
-    
-    //                    m_log.DebugFormat(
-    //                        "[NULL FRIENDS DATA]: Got {0} {1} {2} for {3}",
-    //                        f.Friend, f.Data["Flags"], f2 != null ? f.Data["TheirFlags"] : "not found!", f.PrincipalID);
-                    });
-    
-    //                m_log.DebugFormat("[NULL FRIENDS DATA]: Got {0} friends for {1}", lst.Count, userID);
-    
-                    return lst.ToArray();
-                }
+
+                return lst.ToArray();
             }
 
             return new FriendsData[0];
@@ -107,11 +80,7 @@ namespace OpenSim.Data.Null
             if (data == null)
                 return false;
 
-//            m_log.DebugFormat(
-//                "[NULL FRIENDS DATA]: Storing {0} {1} {2}", data.PrincipalID, data.Friend, data.Data["Flags"]);
-
-            lock (m_Data)
-                m_Data.Add(data);
+            m_Data.Add(data);
 
             return true;
         }
@@ -123,21 +92,14 @@ namespace OpenSim.Data.Null
 
         public bool Delete(string userID, string friendID)
         {
-            lock (m_Data)
+            List<FriendsData> lst = m_Data.FindAll(delegate(FriendsData fdata) { return fdata.PrincipalID == userID.ToString(); });
+            if (lst != null)
             {
-                List<FriendsData> lst = m_Data.FindAll(delegate(FriendsData fdata) { return fdata.PrincipalID == userID.ToString(); });
-                if (lst != null)
+                FriendsData friend = lst.Find(delegate(FriendsData fdata) { return fdata.Friend == friendID; });
+                if (friendID != null)
                 {
-                    FriendsData friend = lst.Find(delegate(FriendsData fdata) { return fdata.Friend == friendID; });
-                    if (friendID != null)
-                    {
-    //                    m_log.DebugFormat(
-    //                        "[NULL FRIENDS DATA]: Deleting friend {0} {1} for {2}",
-    //                        friend.Friend, friend.Data["Flags"], friend.PrincipalID);
-    
-                        m_Data.Remove(friend);
-                        return true;
-                    }
+                    m_Data.Remove(friend);
+                    return true;
                 }
             }
 

OpenSim/Data/Null/NullPresenceData.cs

@@ -110,6 +110,7 @@ namespace OpenSim.Data.Null
             return false;
         }
 
+
         public PresenceData[] Get(string field, string data)
         {
             if (Instance != this)

OpenSim/Data/Null/NullRegionData.cs

@@ -40,40 +40,24 @@ namespace OpenSim.Data.Null
     {
         private static NullRegionData Instance = null;
 
-        /// <summary>
-        /// Should we use the static instance for all invocations?
-        /// </summary>
-        private bool m_useStaticInstance = true;
-
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         Dictionary<UUID, RegionData> m_regionData = new Dictionary<UUID, RegionData>();
 
         public NullRegionData(string connectionString, string realm)
         {
-//            m_log.DebugFormat(
-//                "[NULL REGION DATA]: Constructor got connectionString {0}, realm {1}", connectionString, realm);
-
-            // The !static connection string is a hack so that regression tests can use this module without a high degree of fragility
-            // in having to deal with the static reference in the once-loaded NullRegionData class.
-            //
-            // In standalone operation, we have to use only one instance of this class since the login service and
-            // simulator have no other way of using a common data store.
-            if (connectionString == "!static")
-                m_useStaticInstance = false;
-            else if (Instance == null)
+            if (Instance == null)
                 Instance = this;
+            //Console.WriteLine("[XXX] NullRegionData constructor");
         }
 
         private delegate bool Matcher(string value);
 
         public List<RegionData> Get(string regionName, UUID scopeID)
         {
-            if (m_useStaticInstance && Instance != this)
+            if (Instance != this)
                 return Instance.Get(regionName, scopeID);
 
-//            m_log.DebugFormat("[NULL REGION DATA]: Getting region {0}, scope {1}", regionName, scopeID);
-
             string cleanName = regionName.ToLower();
 
             // Handle SQL wildcards
@@ -98,7 +82,6 @@ namespace OpenSim.Data.Null
                     cleanName = cleanName.Remove(cleanName.Length - 1);
                 }
             }
-
             Matcher queryMatch;
             if (wildcardPrefix && wildcardSuffix)
                 queryMatch = delegate(string s) { return s.Contains(cleanName); };
@@ -127,7 +110,7 @@ namespace OpenSim.Data.Null
 
         public RegionData Get(int posX, int posY, UUID scopeID)
         {
-            if (m_useStaticInstance && Instance != this)
+            if (Instance != this)
                 return Instance.Get(posX, posY, scopeID);
 
             List<RegionData> ret = new List<RegionData>();
@@ -146,7 +129,7 @@ namespace OpenSim.Data.Null
 
         public RegionData Get(UUID regionID, UUID scopeID)
         {
-            if (m_useStaticInstance && Instance != this)
+            if (Instance != this)
                 return Instance.Get(regionID, scopeID);
 
             if (m_regionData.ContainsKey(regionID))
@@ -157,7 +140,7 @@ namespace OpenSim.Data.Null
 
         public List<RegionData> Get(int startX, int startY, int endX, int endY, UUID scopeID)
         {
-            if (m_useStaticInstance && Instance != this)
+            if (Instance != this)
                 return Instance.Get(startX, startY, endX, endY, scopeID);
 
             List<RegionData> ret = new List<RegionData>();
@@ -173,12 +156,9 @@ namespace OpenSim.Data.Null
 
         public bool Store(RegionData data)
         {
-            if (m_useStaticInstance && Instance != this)
+            if (Instance != this)
                 return Instance.Store(data);
 
-//            m_log.DebugFormat(
-//                "[NULL REGION DATA]: Storing region {0} {1}, scope {2}", data.RegionName, data.RegionID, data.ScopeID);
-
             m_regionData[data.RegionID] = data;
 
             return true;
@@ -186,7 +166,7 @@ namespace OpenSim.Data.Null
 
         public bool SetDataItem(UUID regionID, string item, string value)
         {
-            if (m_useStaticInstance && Instance != this)
+            if (Instance != this)
                 return Instance.SetDataItem(regionID, item, value);
 
             if (!m_regionData.ContainsKey(regionID))
@@ -199,11 +179,9 @@ namespace OpenSim.Data.Null
 
         public bool Delete(UUID regionID)
         {
-            if (m_useStaticInstance && Instance != this)
+            if (Instance != this)
                 return Instance.Delete(regionID);
 
-//            m_log.DebugFormat("[NULL REGION DATA]: Deleting region {0}", regionID);
-
             if (!m_regionData.ContainsKey(regionID))
                 return false;
 

OpenSim/Data/Null/NullSimulationData.cs

@@ -76,27 +76,9 @@ namespace OpenSim.Data.Null
             //This connector doesn't support the windlight module yet
         }
 
-        #region Environment Settings
-        public string LoadRegionEnvironmentSettings(UUID regionUUID)
-        {
-            //This connector doesn't support the Environment module yet
-            return string.Empty;
-        }
-
-        public void StoreRegionEnvironmentSettings(UUID regionUUID, string settings)
-        {
-            //This connector doesn't support the Environment module yet
-        }
-
-        public void RemoveRegionEnvironmentSettings(UUID regionUUID)
-        {
-            //This connector doesn't support the Environment module yet
-        }
-        #endregion
-
         public RegionSettings LoadRegionSettings(UUID regionUUID)
-        {
-            RegionSettings rs = new RegionSettings();
+        {
+            RegionSettings rs = new RegionSettings();
             rs.RegionUUID = regionUUID;
             return rs;
         }
@@ -151,18 +133,5 @@ namespace OpenSim.Data.Null
         public void Shutdown()
         {
         }
-
-        public void SaveExtra(UUID regionID, string name, string value)
-        {
-        }
-
-        public void RemoveExtra(UUID regionID, string name)
-        {
-        }
-
-        public Dictionary<string, string> GetExtra(UUID regionID)
-        {
-            return null;
-        }
     }
 }

OpenSim/Data/SQLite/Resources/RegionStore.migrations

@@ -466,112 +466,4 @@ ALTER TABLE `land` ADD COLUMN `MediaSize` VARCHAR(16) NOT NULL DEFAULT '0,0';
 ALTER TABLE `land` ADD COLUMN `MediaLoop` BOOLEAN NOT NULL DEFAULT FALSE;
 ALTER TABLE `land` ADD COLUMN `ObscureMusic` BOOLEAN NOT NULL DEFAULT FALSE;
 ALTER TABLE `land` ADD COLUMN `ObscureMedia` BOOLEAN NOT NULL DEFAULT FALSE;
-COMMIT;
-
-:VERSION 22
-BEGIN;
-ALTER TABLE regionsettings ADD COLUMN covenant_datetime INTEGER NOT NULL default 0;
-COMMIT;
-
-:VERSION 23
-BEGIN;
-CREATE TABLE regionwindlight (
-  region_id VARCHAR(36) NOT NULL DEFAULT '000000-0000-0000-0000-000000000000' PRIMARY KEY,
-  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_color_i FLOAT NOT NULL DEFAULT '1.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 INTEGER 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 INTEGER NOT NULL DEFAULT '0',
-  cloud_scroll_y FLOAT NOT NULL DEFAULT '0.01',
-  cloud_scroll_y_lock INTEGER NOT NULL DEFAULT '0',
-  draw_classic_clouds INTEGER NOT NULL DEFAULT '1');
-
-COMMIT;
-
-
-:VERSION 24
-
-BEGIN;
-
-CREATE TABLE IF NOT EXISTS `spawn_points` (
-  `RegionID` varchar(36) NOT NULL DEFAULT '000000-0000-0000-0000-000000000000',
-  `Yaw` float NOT NULL,
-  `Pitch` float NOT NULL,
-  `Distance` float NOT NULL
-);
-
-ALTER TABLE `regionsettings` ADD COLUMN `TelehubObject` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
-
-COMMIT;
-
-:VERSION 25
-
-BEGIN;
-ALTER TABLE `regionsettings` ADD COLUMN `parcel_tile_ID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
-COMMIT;
-
-:VERSION 26
-
-BEGIN;
-
-CREATE TABLE `regionenvironment` (
-  `region_id` varchar(36) NOT NULL DEFAULT '000000-0000-0000-0000-000000000000' PRIMARY KEY,
-  `llsd_settings` TEXT NOT NULL
-);
-
-COMMIT;
+COMMIT;

OpenSim/Data/SQLite/SQLiteAssetData.cs

@@ -81,9 +81,6 @@ namespace OpenSim.Data.SQLite
         /// <param name="dbconnect">connect string</param>
         override public void Initialise(string dbconnect)
         {
-            if (Util.IsWindows())
-                Util.LoadArchSpecificWindowsDll("sqlite3.dll");
-
             if (dbconnect == string.Empty)
             {
                 dbconnect = "URI=file:Asset.db,version=3";

OpenSim/Data/SQLite/SQLiteAuthenticationData.cs

@@ -65,9 +65,6 @@ namespace OpenSim.Data.SQLite
 
             if (!m_initialized)
             {
-                if (Util.IsWindows())
-                    Util.LoadArchSpecificWindowsDll("sqlite3.dll");
-
                 m_Connection = new SqliteConnection(connectionString);
                 m_Connection.Open();
 

OpenSim/Data/SQLite/SQLiteEstateData.cs

@@ -69,9 +69,6 @@ namespace OpenSim.Data.SQLite
 
         public void Initialise(string connectionString)
         {
-            if (Util.IsWindows())
-                Util.LoadArchSpecificWindowsDll("sqlite3.dll");
-
             m_connectionString = connectionString;
 
             m_log.Info("[ESTATE DB]: Sqlite - connecting: "+m_connectionString);

OpenSim/Data/SQLite/SQLiteFramework.cs

@@ -48,8 +48,6 @@ namespace OpenSim.Data.SQLite
 
         protected SQLiteFramework(string connectionString)
         {
-            if (Util.IsWindows())
-                Util.LoadArchSpecificWindowsDll("sqlite3.dll");
         }
 
         //////////////////////////////////////////////////////////////

OpenSim/Data/SQLite/SQLiteFriendsData.cs

@@ -75,7 +75,7 @@ namespace OpenSim.Data.SQLite
             cmd.Parameters.AddWithValue(":PrincipalID", principalID.ToString());
             cmd.Parameters.AddWithValue(":Friend", friend);
 
-            ExecuteNonQuery(cmd, m_Connection);
+            ExecuteNonQuery(cmd, cmd.Connection);
 
             return true;
         }

OpenSim/Data/SQLite/SQLiteInventoryStore.cs

@@ -77,9 +77,6 @@ namespace OpenSim.Data.SQLite
             {
                 m_Initialized = true;
 
-                if (Util.IsWindows())
-                    Util.LoadArchSpecificWindowsDll("sqlite3.dll");
-
                 if (dbconnect == string.Empty)
                 {
                     dbconnect = "URI=file:inventoryStore.db,version=3";

OpenSim/Data/SQLite/SQLiteXInventoryData.cs

@@ -52,9 +52,6 @@ namespace OpenSim.Data.SQLite
 
         public SQLiteXInventoryData(string conn, string realm)
         {
-            if (Util.IsWindows())
-                Util.LoadArchSpecificWindowsDll("sqlite3.dll");
-
             m_Folders = new SQLiteGenericTableHandler<XInventoryFolder>(
                     conn, "inventoryfolders", "XInventoryStore");
             m_Items = new SqliteItemHandler(

OpenSim/Data/Tests/RegionTests.cs

@@ -244,10 +244,10 @@ namespace OpenSim.Data.Tests
             SceneObjectPart[] newparts = newsog.Parts;
             Assert.That(newparts.Length,Is.EqualTo(4), "Assert.That(newparts.Length,Is.EqualTo(4))");
             
-            Assert.That(newsog.ContainsPart(tmp0), "Assert.That(newsog.ContainsPart(tmp0))");
-            Assert.That(newsog.ContainsPart(tmp1), "Assert.That(newsog.ContainsPart(tmp1))");
-            Assert.That(newsog.ContainsPart(tmp2), "Assert.That(newsog.ContainsPart(tmp2))");
-            Assert.That(newsog.ContainsPart(tmp3), "Assert.That(newsog.ContainsPart(tmp3))");
+            Assert.That(newsog.HasChildPrim(tmp0), "Assert.That(newsog.HasChildPrim(tmp0))");
+            Assert.That(newsog.HasChildPrim(tmp1), "Assert.That(newsog.HasChildPrim(tmp1))");
+            Assert.That(newsog.HasChildPrim(tmp2), "Assert.That(newsog.HasChildPrim(tmp2))");
+            Assert.That(newsog.HasChildPrim(tmp3), "Assert.That(newsog.HasChildPrim(tmp3))");
         }
         
         [Test]
@@ -297,6 +297,7 @@ namespace OpenSim.Data.Tests
             pbshap.ProfileEnd = ushort.MaxValue;
             pbshap.ProfileHollow = ushort.MaxValue;
             Vector3 scale = new Vector3(random.Next(),random.Next(),random.Next());
+            byte updatef = (byte) random.Next(127);
 
             RegionInfo regionInfo = new RegionInfo();
             regionInfo.RegionID = region3;
@@ -335,6 +336,7 @@ namespace OpenSim.Data.Tests
             sop.LinkNum = linknum;
             sop.ClickAction = clickaction;
             sop.Scale = scale;
+            sop.UpdateFlag = updatef;
 
             //Tests if local part accepted the parameters:
             Assert.That(regionh,Is.EqualTo(sop.RegionHandle), "Assert.That(regionh,Is.EqualTo(sop.RegionHandle))");
@@ -367,6 +369,7 @@ namespace OpenSim.Data.Tests
             Assert.That(linknum,Is.EqualTo(sop.LinkNum), "Assert.That(linknum,Is.EqualTo(sop.LinkNum))");
             Assert.That(clickaction,Is.EqualTo(sop.ClickAction), "Assert.That(clickaction,Is.EqualTo(sop.ClickAction))");
             Assert.That(scale,Is.EqualTo(sop.Scale), "Assert.That(scale,Is.EqualTo(sop.Scale))");
+            Assert.That(updatef,Is.EqualTo(sop.UpdateFlag), "Assert.That(updatef,Is.EqualTo(sop.UpdateFlag))");
             
             // This is necessary or object will not be inserted in DB
             sop.Flags = PrimFlags.None;
@@ -466,6 +469,7 @@ namespace OpenSim.Data.Tests
             PrimitiveBaseShape pbshap = new PrimitiveBaseShape();
             pbshap = PrimitiveBaseShape.Default;
             Vector3 scale = new Vector3(random.Next(),random.Next(),random.Next());
+            byte updatef = (byte) random.Next(127);
             
             // Updates the region with new values
             SceneObjectGroup sog2 = FindSOG("Adam  West", region3);
@@ -495,6 +499,7 @@ namespace OpenSim.Data.Tests
             sog2.RootPart.LinkNum = linknum;
             sog2.RootPart.ClickAction = clickaction;
             sog2.RootPart.Scale = scale;
+            sog2.RootPart.UpdateFlag = updatef;
             
             db.StoreObject(sog2, region3);
             List<SceneObjectGroup> sogs = db.LoadObjects(region3);
@@ -632,6 +637,7 @@ namespace OpenSim.Data.Tests
                 .IgnoreProperty(x=>x.RegionUUID)
                 .IgnoreProperty(x=>x.Scene)
                 .IgnoreProperty(x=>x.Parts)
+                .IgnoreProperty(x=>x.PassCollision)
                 .IgnoreProperty(x=>x.RootPart));
         }
 
@@ -684,7 +690,7 @@ namespace OpenSim.Data.Tests
             SceneObjectGroup sog = GetMySOG("object1");
             InventoryItemBase i = NewItem(item1, zero, zero, itemname1, zero);
 
-            Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, i, zero), Is.True);
+            Assert.That(sog.AddInventoryItem(null, sog.RootPart.LocalId, i, zero), Is.True);
             TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, item1);
             Assert.That(t.Name, Is.EqualTo(itemname1), "Assert.That(t.Name, Is.EqualTo(itemname1))");
             
@@ -761,7 +767,7 @@ namespace OpenSim.Data.Tests
             i.CreationDate = creationd;
             
             SceneObjectGroup sog = GetMySOG("object1");
-            Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, i, zero), Is.True);
+            Assert.That(sog.AddInventoryItem(null, sog.RootPart.LocalId, i, zero), Is.True);
             TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, id);
             
             Assert.That(t.Name, Is.EqualTo(name), "Assert.That(t.Name, Is.EqualTo(name))");
@@ -806,10 +812,10 @@ namespace OpenSim.Data.Tests
             
             SceneObjectGroup sog = FindSOG("object1", region1);
 
-            Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, ib1, zero), Is.True);
-            Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, ib2, zero), Is.True);
-            Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, ib3, zero), Is.True);
-            Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, ib4, zero), Is.True);
+            Assert.That(sog.AddInventoryItem(null, sog.RootPart.LocalId, ib1, zero), Is.True);
+            Assert.That(sog.AddInventoryItem(null, sog.RootPart.LocalId, ib2, zero), Is.True);
+            Assert.That(sog.AddInventoryItem(null, sog.RootPart.LocalId, ib3, zero), Is.True);
+            Assert.That(sog.AddInventoryItem(null, sog.RootPart.LocalId, ib4, zero), Is.True);
             
             TaskInventoryItem t1 = sog.GetInventoryItem(sog.RootPart.LocalId, i1);
             Assert.That(t1.Name, Is.EqualTo(ib1.Name), "Assert.That(t1.Name, Is.EqualTo(ib1.Name))");
@@ -1069,6 +1075,8 @@ namespace OpenSim.Data.Tests
             regionInfo.RegionLocX = 0;
             regionInfo.RegionLocY = 0;
 
+            Scene scene = new Scene(regionInfo);
+
             SceneObjectPart sop = new SceneObjectPart();
             sop.Name = name;
             sop.Description = name;
@@ -1079,7 +1087,7 @@ namespace OpenSim.Data.Tests
             sop.Shape = PrimitiveBaseShape.Default;
 
             SceneObjectGroup sog = new SceneObjectGroup(sop);
-//            sog.SetScene(scene);
+            sog.SetScene(scene);
 
             return sog;
         }

OpenSim/Framework/AgentCircuitData.cs

@@ -98,11 +98,6 @@ namespace OpenSim.Framework
         /// </summary>
         public string lastname;
 
-        /// <summary>
-        /// Agent's full name.
-        /// </summary>
-        public string Name { get { return string.Format("{0} {1}", firstname, lastname); } }
-
         /// <summary>
         /// Random Unique GUID for this session.  Client gets this at login and it's
         /// only supposed to be disclosed over secure channels
@@ -301,7 +296,7 @@ namespace OpenSim.Framework
             if (args["start_pos"] != null)
                 Vector3.TryParse(args["start_pos"].AsString(), out startpos);
 
-            //m_log.InfoFormat("[AGENTCIRCUITDATA]: agentid={0}, child={1}, startpos={2}", AgentID, child, startpos);
+            m_log.InfoFormat("[AGENTCIRCUITDATA]: agentid={0}, child={1}, startpos={2}", AgentID, child, startpos);
             
             try
             {

OpenSim/Framework/AgentCircuitManager.cs

@@ -35,36 +35,22 @@ namespace OpenSim.Framework
     /// </summary>
     public class AgentCircuitManager
     {
-        /// <summary>
-        /// Agent circuits indexed by circuit code.
-        /// </summary>
-        /// <remarks>
-        /// We lock this for operations both on this dictionary and on m_agentCircuitsByUUID
-        /// </remarks>
-        private Dictionary<uint, AgentCircuitData> m_agentCircuits = new Dictionary<uint, AgentCircuitData>();
-
-        /// <summary>
-        /// Agent circuits indexed by agent UUID.
-        /// </summary>
-        private Dictionary<UUID, AgentCircuitData> m_agentCircuitsByUUID = new Dictionary<UUID, AgentCircuitData>();
+        public Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>();
+        public Dictionary<UUID, AgentCircuitData> AgentCircuitsByUUID = new Dictionary<UUID, AgentCircuitData>();
 
         public virtual AuthenticateResponse AuthenticateSession(UUID sessionID, UUID agentID, uint circuitcode)
         {
             AgentCircuitData validcircuit = null;
-
-            lock (m_agentCircuits)
+            if (AgentCircuits.ContainsKey(circuitcode))
             {
-                if (m_agentCircuits.ContainsKey(circuitcode))
-                    validcircuit = m_agentCircuits[circuitcode];
+                validcircuit = AgentCircuits[circuitcode];
             }
-
             AuthenticateResponse user = new AuthenticateResponse();
-
             if (validcircuit == null)
             {
                 //don't have this circuit code in our list
                 user.Authorised = false;
-                return user;
+                return (user);
             }
 
             if ((sessionID == validcircuit.SessionID) && (agentID == validcircuit.AgentID))
@@ -86,7 +72,7 @@ namespace OpenSim.Framework
                 user.Authorised = false;
             }
 
-            return user;
+            return (user);
         }
 
         /// <summary>
@@ -96,93 +82,73 @@ namespace OpenSim.Framework
         /// <param name="agentData"></param>
         public virtual void AddNewCircuit(uint circuitCode, AgentCircuitData agentData)
         {
-            lock (m_agentCircuits)
+            lock (AgentCircuits)
             {
-                if (m_agentCircuits.ContainsKey(circuitCode))
+                if (AgentCircuits.ContainsKey(circuitCode))
                 {
-                    m_agentCircuits[circuitCode] = agentData;
-                    m_agentCircuitsByUUID[agentData.AgentID] = agentData;
+                    AgentCircuits[circuitCode] = agentData;
+                    AgentCircuitsByUUID[agentData.AgentID] = agentData;
                 }
                 else
                 {
-                    m_agentCircuits.Add(circuitCode, agentData);
-                    m_agentCircuitsByUUID[agentData.AgentID] = agentData;
+                    AgentCircuits.Add(circuitCode, agentData);
+                    AgentCircuitsByUUID[agentData.AgentID] = agentData;
                 }
             }
         }
 
         public virtual void RemoveCircuit(uint circuitCode)
         {
-            lock (m_agentCircuits)
+            lock (AgentCircuits)
             {
-                if (m_agentCircuits.ContainsKey(circuitCode))
+                if (AgentCircuits.ContainsKey(circuitCode))
                 {
-                    UUID agentID = m_agentCircuits[circuitCode].AgentID;
-                    m_agentCircuits.Remove(circuitCode);
-                    m_agentCircuitsByUUID.Remove(agentID);
+                    UUID agentID = AgentCircuits[circuitCode].AgentID;
+                    AgentCircuits.Remove(circuitCode);
+                    AgentCircuitsByUUID.Remove(agentID);
                 }
             }
         }
 
         public virtual void RemoveCircuit(UUID agentID)
         {
-            lock (m_agentCircuits)
+            lock (AgentCircuits)
             {
-                if (m_agentCircuitsByUUID.ContainsKey(agentID))
+                if (AgentCircuitsByUUID.ContainsKey(agentID))
                 {
-                    uint circuitCode = m_agentCircuitsByUUID[agentID].circuitcode;
-                    m_agentCircuits.Remove(circuitCode);
-                    m_agentCircuitsByUUID.Remove(agentID);
+                    uint circuitCode = AgentCircuitsByUUID[agentID].circuitcode;
+                    AgentCircuits.Remove(circuitCode);
+                    AgentCircuitsByUUID.Remove(agentID);
                 }
             }
         }
-
         public AgentCircuitData GetAgentCircuitData(uint circuitCode)
         {
             AgentCircuitData agentCircuit = null;
-
-            lock (m_agentCircuits)
-                m_agentCircuits.TryGetValue(circuitCode, out agentCircuit);
-
+            AgentCircuits.TryGetValue(circuitCode, out agentCircuit);
             return agentCircuit;
         }
 
         public AgentCircuitData GetAgentCircuitData(UUID agentID)
         {
             AgentCircuitData agentCircuit = null;
-
-            lock (m_agentCircuits)
-                m_agentCircuitsByUUID.TryGetValue(agentID, out agentCircuit);
-
+            AgentCircuitsByUUID.TryGetValue(agentID, out agentCircuit);
             return agentCircuit;
         }
 
-        /// <summary>
-        /// Get all current agent circuits indexed by agent UUID.
-        /// </summary>
-        /// <returns></returns>
-        public Dictionary<UUID, AgentCircuitData> GetAgentCircuits()
-        {
-            lock (m_agentCircuits)
-                return new Dictionary<UUID, AgentCircuitData>(m_agentCircuitsByUUID);
-        }
-
         public void UpdateAgentData(AgentCircuitData agentData)
         {
-            lock (m_agentCircuits)
+            if (AgentCircuits.ContainsKey((uint) agentData.circuitcode))
             {
-                if (m_agentCircuits.ContainsKey((uint) agentData.circuitcode))
-                {
-                    m_agentCircuits[(uint) agentData.circuitcode].firstname = agentData.firstname;
-                    m_agentCircuits[(uint) agentData.circuitcode].lastname = agentData.lastname;
-                    m_agentCircuits[(uint) agentData.circuitcode].startpos = agentData.startpos;
+                AgentCircuits[(uint) agentData.circuitcode].firstname = agentData.firstname;
+                AgentCircuits[(uint) agentData.circuitcode].lastname = agentData.lastname;
+                AgentCircuits[(uint) agentData.circuitcode].startpos = agentData.startpos;
 
-                    // Updated for when we don't know them before calling Scene.NewUserConnection
-                    m_agentCircuits[(uint) agentData.circuitcode].SecureSessionID = agentData.SecureSessionID;
-                    m_agentCircuits[(uint) agentData.circuitcode].SessionID = agentData.SessionID;
+                // Updated for when we don't know them before calling Scene.NewUserConnection
+                AgentCircuits[(uint) agentData.circuitcode].SecureSessionID = agentData.SecureSessionID;
+                AgentCircuits[(uint) agentData.circuitcode].SessionID = agentData.SessionID;
 
-                    // m_log.Debug("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);
-                }
+                // m_log.Debug("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);
             }
         }
 
@@ -193,37 +159,38 @@ namespace OpenSim.Framework
         /// <param name="newcircuitcode"></param>
         public bool TryChangeCiruitCode(uint circuitcode, uint newcircuitcode)
         {
-            lock (m_agentCircuits)
+            lock (AgentCircuits)
             {
-                if (m_agentCircuits.ContainsKey((uint)circuitcode) && !m_agentCircuits.ContainsKey((uint)newcircuitcode))
+                if (AgentCircuits.ContainsKey((uint)circuitcode) && !AgentCircuits.ContainsKey((uint)newcircuitcode))
                 {
-                    AgentCircuitData agentData = m_agentCircuits[(uint)circuitcode];
+                    AgentCircuitData agentData = AgentCircuits[(uint)circuitcode];
 
                     agentData.circuitcode = newcircuitcode;
 
-                    m_agentCircuits.Remove((uint)circuitcode);
-                    m_agentCircuits.Add(newcircuitcode, agentData);
+                    AgentCircuits.Remove((uint)circuitcode);
+                    AgentCircuits.Add(newcircuitcode, agentData);
                     return true;
                 }
             }
-
             return false;
+
         }
 
         public void UpdateAgentChildStatus(uint circuitcode, bool childstatus)
         {
-            lock (m_agentCircuits)
-                if (m_agentCircuits.ContainsKey(circuitcode))
-                    m_agentCircuits[circuitcode].child = childstatus;
+            if (AgentCircuits.ContainsKey(circuitcode))
+            {
+                AgentCircuits[circuitcode].child = childstatus;
+            }
         }
 
         public bool GetAgentChildStatus(uint circuitcode)
         {
-            lock (m_agentCircuits)
-                if (m_agentCircuits.ContainsKey(circuitcode))
-                    return m_agentCircuits[circuitcode].child;
-
+            if (AgentCircuits.ContainsKey(circuitcode))
+            {
+                return AgentCircuits[circuitcode].child;
+            }
             return false;
         }
     }
-}
+}

OpenSim/Framework/AvatarAppearance.cs

@@ -53,6 +53,7 @@ namespace OpenSim.Framework
         protected AvatarWearable[] m_wearables;
         protected Dictionary<int, List<AvatarAttachment>> m_attachments;
         protected float m_avatarHeight = 0;
+        protected float m_hipOffset = 0;
 
         public virtual int Serial
         {
@@ -88,6 +89,11 @@ namespace OpenSim.Framework
             set { m_avatarHeight = value; }
         }
 
+        public virtual float HipOffset
+        {
+            get { return m_hipOffset; }
+        }
+
         public AvatarAppearance()
         {
 //            m_log.WarnFormat("[AVATAR APPEARANCE]: create empty appearance");
@@ -178,6 +184,7 @@ namespace OpenSim.Framework
                 m_visualparams = (byte[])appearance.VisualParams.Clone();
 
             m_avatarHeight = appearance.m_avatarHeight;
+            m_hipOffset = appearance.m_hipOffset;
 
             // Copy the attachment, force append mode since that ensures consistency
             m_attachments = new Dictionary<int, List<AvatarAttachment>>();
@@ -249,12 +256,10 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Set up appearance texture ids.
+        /// Set up appearance textures.
+        /// Returns boolean that indicates whether the new entries actually change the
+        /// existing values.
         /// </summary>
-        /// <returns>
-        /// True if any existing texture id was changed by the new data.
-        /// False if there were no changes or no existing texture ids.
-        /// </returns>
         public virtual bool SetTextureEntries(Primitive.TextureEntry textureEntry)
         {
             if (textureEntry == null)
@@ -271,30 +276,25 @@ namespace OpenSim.Framework
 
                 if (newface == null)
                 {
-                    if (oldface == null)
-                        continue;
+                    if (oldface == null) continue;
                 }
                 else
                 {
-                    if (oldface != null && oldface.TextureID == newface.TextureID)
-                        continue;
+                    if (oldface != null && oldface.TextureID == newface.TextureID) continue;
                 }
 
                 changed = true;
             }
 
             m_texture = textureEntry;
-            
             return changed;
         }
 
         /// <summary>
         /// Set up visual parameters for the avatar and refresh the avatar height
+        /// Returns boolean that indicates whether the new entries actually change the
+        /// existing values.
         /// </summary>
-        /// <returns>
-        /// True if any existing visual parameter was changed by the new data.
-        /// False if there were no changes or no existing visual parameters.
-        /// </returns>
         public virtual bool SetVisualParams(byte[] visualParams)
         {
             if (visualParams == null)
@@ -332,18 +332,20 @@ namespace OpenSim.Framework
 
         public virtual void SetHeight()
         {
-            // Start with shortest possible female avatar height
-            m_avatarHeight = 1.14597f;
-            // Add offset for male avatars
-            if (m_visualparams[(int)VPElement.SHAPE_MALE] != 0)
-                m_avatarHeight += 0.0848f;
-            // Add offsets for visual params
-            m_avatarHeight += 0.516945f * (float)m_visualparams[(int)VPElement.SHAPE_HEIGHT]          / 255.0f
-                            + 0.08117f  * (float)m_visualparams[(int)VPElement.SHAPE_HEAD_SIZE]       / 255.0f
-                            + 0.3836f   * (float)m_visualparams[(int)VPElement.SHAPE_LEG_LENGTH]      / 255.0f
-                            + 0.07f     * (float)m_visualparams[(int)VPElement.SHOES_PLATFORM_HEIGHT] / 255.0f
-                            + 0.08f     * (float)m_visualparams[(int)VPElement.SHOES_HEEL_HEIGHT]     / 255.0f
-                            + 0.076f    * (float)m_visualparams[(int)VPElement.SHAPE_NECK_LENGTH]     / 255.0f;
+            m_avatarHeight = 1.23077f  // Shortest possible avatar height
+                           + 0.516945f * (float)m_visualparams[(int)VPElement.SHAPE_HEIGHT] / 255.0f   // Body height
+                           + 0.072514f * (float)m_visualparams[(int)VPElement.SHAPE_HEAD_SIZE] / 255.0f  // Head size
+                           + 0.3836f * (float)m_visualparams[(int)VPElement.SHAPE_LEG_LENGTH] / 255.0f    // Leg length
+                           + 0.08f * (float)m_visualparams[(int)VPElement.SHOES_PLATFORM_HEIGHT] / 255.0f    // Shoe platform height
+                           + 0.07f * (float)m_visualparams[(int)VPElement.SHOES_HEEL_HEIGHT] / 255.0f    // Shoe heel height
+                           + 0.076f * (float)m_visualparams[(int)VPElement.SHAPE_NECK_LENGTH] / 255.0f;    // Neck length
+
+            m_hipOffset = (((1.23077f // Half of avatar
+                           + 0.516945f * (float)m_visualparams[(int)VPElement.SHAPE_HEIGHT] / 255.0f   // Body height
+                           + 0.3836f * (float)m_visualparams[(int)VPElement.SHAPE_LEG_LENGTH] / 255.0f    // Leg length
+                           + 0.08f * (float)m_visualparams[(int)VPElement.SHOES_PLATFORM_HEIGHT] / 255.0f    // Shoe platform height
+                           + 0.07f * (float)m_visualparams[(int)VPElement.SHOES_HEEL_HEIGHT] / 255.0f    // Shoe heel height
+                           ) / 2) - m_avatarHeight / 2) * 0.31f - 0.0425f;
         }
 
         public virtual void SetWearable(int wearableId, AvatarWearable wearable)
@@ -576,6 +578,7 @@ namespace OpenSim.Framework
 
             data["serial"] = OSD.FromInteger(m_serial);
             data["height"] = OSD.FromReal(m_avatarHeight);
+            data["hipoffset"] = OSD.FromReal(m_hipOffset);
 
             // Wearables
             OSDArray wears = new OSDArray(AvatarWearable.MAX_WEARABLES);
@@ -618,6 +621,8 @@ namespace OpenSim.Framework
                 m_serial = data["serial"].AsInteger();
             if ((data != null) && (data["height"] != null))
                 m_avatarHeight = (float)data["height"].AsReal();
+            if ((data != null) && (data["hipoffset"] != null))
+                m_hipOffset = (float)data["hipoffset"].AsReal();
 
             try
             {

OpenSim/Framework/Cache.cs

@@ -199,14 +199,7 @@ namespace OpenSim.Framework
     //
     public class Cache
     {
-        /// <summary>
-        /// Must only be accessed under lock.
-        /// </summary>
         private List<CacheItemBase> m_Index = new List<CacheItemBase>();
-
-        /// <summary>
-        /// Must only be accessed under m_Index lock.
-        /// </summary>
         private Dictionary<string, CacheItemBase> m_Lookup =
             new Dictionary<string, CacheItemBase>();
 
@@ -327,19 +320,19 @@ namespace OpenSim.Framework
             {
                 if (m_Lookup.ContainsKey(index))
                     item = m_Lookup[index];
-
-                if (item == null)
-                {
-                    Expire(true);
-                    return null;
-                }
-    
-                item.hits++;
-                item.lastUsed = DateTime.Now;
-    
-                Expire(true);
             }
 
+            if (item == null)
+            {
+                Expire(true);
+                return null;
+            }
+
+            item.hits++;
+            item.lastUsed = DateTime.Now;
+
+            Expire(true);
+
             return item;
         }
 
@@ -392,10 +385,7 @@ namespace OpenSim.Framework
         //
         public Object Find(Predicate<CacheItemBase> d)
         {
-            CacheItemBase item;
-
-            lock (m_Index)
-                item = m_Index.Find(d);
+            CacheItemBase item = m_Index.Find(d);
 
             if (item == null)
                 return null;
@@ -429,12 +419,12 @@ namespace OpenSim.Framework
         public virtual void Store(string index, Object data, Type container,
                 Object[] parameters)
         {
+            Expire(false);
+
             CacheItemBase item;
 
             lock (m_Index)
             {
-                Expire(false);
-
                 if (m_Index.Contains(new CacheItemBase(index)))
                 {
                     if ((m_Flags & CacheFlags.AllowUpdate) != 0)
@@ -460,17 +450,9 @@ namespace OpenSim.Framework
                 m_Index.Add(item);
                 m_Lookup[index] = item;
             }
-
             item.Store(data);
         }
 
-        /// <summary>
-        /// Expire items as appropriate.
-        /// </summary>
-        /// <remarks>
-        /// Callers must lock m_Index.
-        /// </remarks>
-        /// <param name='getting'></param>
         protected virtual void Expire(bool getting)
         {
             if (getting && (m_Strategy == CacheStrategy.Aggressive))
@@ -493,10 +475,12 @@ namespace OpenSim.Framework
 
             switch (m_Strategy)
             {
-                case CacheStrategy.Aggressive:
-                    if (Count < Size)
-                        return;
+            case CacheStrategy.Aggressive:
+                if (Count < Size)
+                    return;
 
+                lock (m_Index)
+                {
                     m_Index.Sort(new SortLRU());
                     m_Index.Reverse();
 
@@ -506,7 +490,7 @@ namespace OpenSim.Framework
 
                     ExpireDelegate doExpire = OnExpire;
 
-                    if (doExpire != null)
+                if (doExpire != null)
                     {
                         List<CacheItemBase> candidates =
                                 m_Index.GetRange(target, Count - target);
@@ -529,34 +513,27 @@ namespace OpenSim.Framework
                         foreach (CacheItemBase item in m_Index)
                             m_Lookup[item.uuid] = item;
                     }
-
-                    break;
-
-                    default:
-                        break;
+                }
+                break;
+            default:
+                break;
             }
         }
 
         public void Invalidate(string uuid)
         {
-            lock (m_Index)
-            {
-                if (!m_Lookup.ContainsKey(uuid))
-                    return;
+            if (!m_Lookup.ContainsKey(uuid))
+                return;
 
-                CacheItemBase item = m_Lookup[uuid];
-                m_Lookup.Remove(uuid);
-                m_Index.Remove(item);
-            }
+            CacheItemBase item = m_Lookup[uuid];
+            m_Lookup.Remove(uuid);
+            m_Index.Remove(item);
         }
 
         public void Clear()
         {
-            lock (m_Index)
-            {
-                m_Index.Clear();
-                m_Lookup.Clear();
-            }
+            m_Index.Clear();
+            m_Lookup.Clear();
         }
     }
-}
+}

OpenSim/Framework/ChildAgentDataUpdate.cs

@@ -478,7 +478,7 @@ namespace OpenSim.Framework
         /// <param name="hash"></param>
         public virtual void Unpack(OSDMap args, IScene scene)
         {
-            //m_log.InfoFormat("[CHILDAGENTDATAUPDATE] Unpack data");
+            m_log.InfoFormat("[CHILDAGENTDATAUPDATE] Unpack data");
 
             if (args.ContainsKey("region_id"))
                 UUID.TryParse(args["region_id"].AsString(), out RegionID);

OpenSim/Framework/Client/IClientInventory.cs

@@ -1,40 +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 OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Framework.Client
-{
-    public interface IClientInventory
-    {
-        void SendRemoveInventoryFolders(UUID[] folders);
-        void SendRemoveInventoryItems(UUID[] folders);
-        void SendBulkUpdateInventory(InventoryFolderBase[] folders, InventoryItemBase[] items);
-    }
-}

OpenSim/Framework/Console/CommandConsole.cs

@@ -29,10 +29,8 @@ using System;
 using System.Xml;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using System.Reflection;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Threading;
 using log4net;
 using OpenSim.Framework;
@@ -41,8 +39,6 @@ namespace OpenSim.Framework.Console
 {
     public class Commands : ICommands
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
         /// <summary>
         /// Encapsulates a command that can be invoked from the console
         /// </summary>
@@ -79,23 +75,12 @@ namespace OpenSim.Framework.Console
             public List<CommandDelegate> fn;
         }
 
-        public const string GeneralHelpText
-            = "To enter an argument that contains spaces, surround the argument with double quotes.\nFor example, show object name \"My long object name\"\n";
-
-        public const string ItemHelpText
-                = "For more information, type 'help <item>' where <item> is one of the following:";
-
         /// <value>
         /// Commands organized by keyword in a tree
         /// </value>
         private Dictionary<string, object> tree =
                 new Dictionary<string, object>();
 
-        /// <summary>
-        /// Commands organized by module
-        /// </summary>
-        private Dictionary<string, List<CommandInfo>> m_modulesCommands = new Dictionary<string, List<CommandInfo>>();
-
         /// <summary>
         /// Get help for the given help string
         /// </summary>
@@ -112,10 +97,8 @@ namespace OpenSim.Framework.Console
             // General help
             if (helpParts.Count == 0)
             {
-                help.Add(""); // Will become a newline.
-                help.Add(GeneralHelpText);
-                help.Add(ItemHelpText);
-                help.AddRange(CollectModulesHelp(tree));
+                help.AddRange(CollectHelp(tree));
+                help.Sort();
             }
             else
             {
@@ -134,13 +117,6 @@ namespace OpenSim.Framework.Console
         {
             string originalHelpRequest = string.Join(" ", helpParts.ToArray());
             List<string> help = new List<string>();
-
-            // Check modules first to see if we just need to display a list of those commands
-            if (TryCollectModuleHelp(originalHelpRequest, help))
-            {
-                help.Insert(0, ItemHelpText);
-                return help;
-            }
             
             Dictionary<string, object> dict = tree;
             while (helpParts.Count > 0)
@@ -184,63 +160,25 @@ namespace OpenSim.Framework.Console
             return help;
         }
 
-        /// <summary>
-        /// Try to collect help for the given module if that module exists.
-        /// </summary>
-        /// <param name="moduleName"></param>
-        /// <param name="helpText">/param>
-        /// <returns>true if there was the module existed, false otherwise.</returns>
-        private bool TryCollectModuleHelp(string moduleName, List<string> helpText)
+        private List<string> CollectHelp(Dictionary<string, object> dict)
         {
-            lock (m_modulesCommands)
+            List<string> result = new List<string>();
+
+            foreach (KeyValuePair<string, object> kvp in dict)
             {
-                foreach (string key in m_modulesCommands.Keys)
+                if (kvp.Value is Dictionary<string, Object>)
                 {
-                    // Allow topic help requests to succeed whether they are upper or lowercase.
-                    if (moduleName.ToLower() == key.ToLower())
-                    {
-                        List<CommandInfo> commands = m_modulesCommands[key];
-                        var ourHelpText = commands.ConvertAll(c => string.Format("{0} - {1}", c.help_text, c.long_help));
-                        ourHelpText.Sort();
-                        helpText.AddRange(ourHelpText);
-
-                        return true;
-                    }
+                    result.AddRange(CollectHelp((Dictionary<string, Object>)kvp.Value));
+                }
+                else
+                {
+                    if (((CommandInfo)kvp.Value).long_help != String.Empty)
+                        result.Add(((CommandInfo)kvp.Value).help_text+" - "+
+                                ((CommandInfo)kvp.Value).long_help);
                 }
-
-                return false;
             }
+            return result;
         }
-
-        private List<string> CollectModulesHelp(Dictionary<string, object> dict)
-        {
-            lock (m_modulesCommands)
-            {
-                List<string> helpText = new List<string>(m_modulesCommands.Keys);
-                helpText.Sort();
-                return helpText;
-            }
-        }
-
-//        private List<string> CollectHelp(Dictionary<string, object> dict)
-//        {
-//            List<string> result = new List<string>();
-//
-//            foreach (KeyValuePair<string, object> kvp in dict)
-//            {
-//                if (kvp.Value is Dictionary<string, Object>)
-//                {
-//                    result.AddRange(CollectHelp((Dictionary<string, Object>)kvp.Value));
-//                }
-//                else
-//                {
-//                    if (((CommandInfo)kvp.Value).long_help != String.Empty)
-//                        result.Add(((CommandInfo)kvp.Value).help_text+" - "+
-//                                ((CommandInfo)kvp.Value).long_help);
-//                }
-//            }
-//            return result;
-//        }
         
         /// <summary>
         /// Add a command to those which can be invoked from the console.
@@ -273,19 +211,21 @@ namespace OpenSim.Framework.Console
 
             Dictionary<string, Object> current = tree;
             
-            foreach (string part in parts)
+            foreach (string s in parts)
             {
-                if (current.ContainsKey(part))
+                if (current.ContainsKey(s))
                 {
-                    if (current[part] is Dictionary<string, Object>)
-                        current = (Dictionary<string, Object>)current[part];
+                    if (current[s] is Dictionary<string, Object>)
+                    {
+                        current = (Dictionary<string, Object>)current[s];
+                    }
                     else
                         return;
                 }
                 else
                 {
-                    current[part] = new Dictionary<string, Object>();
-                    current = (Dictionary<string, Object>)current[part];
+                    current[s] = new Dictionary<string, Object>();
+                    current = (Dictionary<string, Object>)current[s];
                 }
             }
 
@@ -309,24 +249,6 @@ namespace OpenSim.Framework.Console
             info.fn = new List<CommandDelegate>();
             info.fn.Add(fn);
             current[String.Empty] = info;
-
-            // Now add command to modules dictionary
-            lock (m_modulesCommands)
-            {
-                List<CommandInfo> commands;
-                if (m_modulesCommands.ContainsKey(module))
-                {
-                    commands = m_modulesCommands[module];
-                }
-                else
-                {
-                    commands = new List<CommandInfo>();
-                    m_modulesCommands[module] = commands;
-                }
-
-//                m_log.DebugFormat("[COMMAND CONSOLE]: Adding to category {0} command {1}", module, command);
-                commands.Add(info);
-            }
         }
 
         public string[] FindNextOption(string[] cmd, bool term)
@@ -609,11 +531,6 @@ namespace OpenSim.Framework.Console
 
     public class Parser
     {
-        // If an unquoted portion ends with an element matching this regex
-        // and the next element contains a space, then we have stripped
-        // embedded quotes that should not have been stripped
-        private static Regex optionRegex = new Regex("^--[a-zA-Z0-9-]+=$");
-
         public static string[] Parse(string text)
         {
             List<string> result = new List<string>();
@@ -627,38 +544,10 @@ namespace OpenSim.Framework.Console
                 if (index % 2 == 0)
                 {
                     string[] words = unquoted[index].Split(new char[] {' '});
-
-                    bool option = false;
                     foreach (string w in words)
                     {
                         if (w != String.Empty)
-                        {
-                            if (optionRegex.Match(w) == Match.Empty)
-                                option = false;
-                            else
-                                option = true;
                             result.Add(w);
-                        }
-                    }
-                    // The last item matched the regex, put the quotes back
-                    if (option)
-                    {
-                        // If the line ended with it, don't do anything
-                        if (index < (unquoted.Length - 1))
-                        {
-                            // Get and remove the option name
-                            string optionText = result[result.Count - 1];
-                            result.RemoveAt(result.Count - 1);
-
-                            // Add the quoted value back
-                            optionText += "\"" + unquoted[index + 1] + "\"";
-
-                            // Push the result into our return array
-                            result.Add(optionText);
-
-                            // Skip the already used value
-                            index++;
-                        }
                     }
                 }
                 else
@@ -678,17 +567,14 @@ namespace OpenSim.Framework.Console
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public event OnOutputDelegate OnOutput;
-
         public ICommands Commands { get; private set; }
 
         public CommandConsole(string defaultPrompt) : base(defaultPrompt)
         {
             Commands = new Commands();
 
-            Commands.AddCommand(
-                "Help", false, "help", "help [<item>]",
-                "Display help on a particular command or on a list of commands in a category", Help);
+            Commands.AddCommand("console", false, "help", "help [<command>]", 
+                    "Get general command list or more detailed help on a specific command", Help);
         }
 
         private void Help(string module, string[] cmd)
@@ -699,13 +585,6 @@ namespace OpenSim.Framework.Console
                 Output(s);
         }
 
-        protected void FireOnOutput(string text)
-        {
-            OnOutputDelegate onOutput = OnOutput;
-            if (onOutput != null)
-                onOutput(text);
-        }
-
         /// <summary>
         /// Display a command prompt on the console and wait for user input
         /// </summary>

OpenSim/Framework/Console/ConsoleDisplayList.cs

@@ -1,112 +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.Linq;
-using System.Text;
-
-namespace OpenSim.Framework.Console
-{
-    /// <summary>
-    /// Used to generated a formatted table for the console.
-    /// </summary>
-    /// <remarks>
-    /// Currently subject to change.  If you use this, be prepared to change your code when this class changes.
-    /// </remarks>
-    public class ConsoleDisplayList
-    {
-        /// <summary>
-        /// The default divider between key and value for a list item.
-        /// </summary>
-        public const string DefaultKeyValueDivider = " : ";
-
-        /// <summary>
-        /// The divider used between key and value for a list item.
-        /// </summary>
-        public string KeyValueDivider { get; set; }
-
-        /// <summary>
-        /// Table rows
-        /// </summary>
-        public List<KeyValuePair<string, string>> Rows { get; private set; }
-
-        /// <summary>
-        /// Number of spaces to indent the list.
-        /// </summary>
-        public int Indent { get; set; }
-
-        public ConsoleDisplayList()
-        {
-            Rows = new List<KeyValuePair<string, string>>();
-            KeyValueDivider = DefaultKeyValueDivider;
-        }
-
-        public override string ToString()
-        {
-            StringBuilder sb = new StringBuilder();
-            AddToStringBuilder(sb);
-            return sb.ToString();
-        }
-
-        public void AddToStringBuilder(StringBuilder sb)
-        {
-            string formatString = GetFormatString();
-//            System.Console.WriteLine("FORMAT STRING [{0}]", formatString);
-
-            // rows
-            foreach (KeyValuePair<string, string> row in Rows)
-                sb.AppendFormat(formatString, row.Key, row.Value);
-        }
-
-        /// <summary>
-        /// Gets the format string for the table.
-        /// </summary>
-        private string GetFormatString()
-        {
-            StringBuilder formatSb = new StringBuilder();
-
-            int longestKey = -1;
-
-            foreach (KeyValuePair<string, string> row in Rows)
-                if (row.Key.Length > longestKey)
-                    longestKey = row.Key.Length;
-
-            formatSb.Append(' ', Indent);
-
-            // Can only do left formatting for now
-            formatSb.AppendFormat("{{0,-{0}}}{1}{{1}}\n", longestKey, KeyValueDivider);
-
-            return formatSb.ToString();
-        }
-
-        public void AddRow(object key, object value)
-        {
-            Rows.Add(new KeyValuePair<string, string>(key.ToString(), value.ToString()));
-        }
-    }
-}

OpenSim/Framework/Console/ConsoleDisplayTable.cs

@@ -1,154 +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.Linq;
-using System.Text;
-
-namespace OpenSim.Framework.Console
-{
-    /// <summary>
-    /// Used to generated a formatted table for the console.
-    /// </summary>
-    /// <remarks>
-    /// Currently subject to change.  If you use this, be prepared to change your code when this class changes.
-    /// </remarks>
-    public class ConsoleDisplayTable
-    {
-        /// <summary>
-        /// Default number of spaces between table columns.
-        /// </summary>
-        public const int DefaultTableSpacing = 2;
-
-        /// <summary>
-        /// Table columns.
-        /// </summary>
-        public List<ConsoleDisplayTableColumn> Columns { get; private set; }
-
-        /// <summary>
-        /// Table rows
-        /// </summary>
-        public List<ConsoleDisplayTableRow> Rows { get; private set; }
-
-        /// <summary>
-        /// Number of spaces to indent the table.
-        /// </summary>
-        public int Indent { get; set; }
-
-        /// <summary>
-        /// Spacing between table columns
-        /// </summary>
-        public int TableSpacing { get; set; }
-
-        public ConsoleDisplayTable()
-        {
-            TableSpacing = DefaultTableSpacing;
-            Columns = new List<ConsoleDisplayTableColumn>();
-            Rows = new List<ConsoleDisplayTableRow>();
-        }
-
-        public override string ToString()
-        {
-            StringBuilder sb = new StringBuilder();
-            AddToStringBuilder(sb);
-            return sb.ToString();
-        }
-
-        public void AddColumn(string name, int width)
-        {
-            Columns.Add(new ConsoleDisplayTableColumn(name, width));
-        }
-
-        public void AddRow(params string[] cells)
-        {
-            Rows.Add(new ConsoleDisplayTableRow(cells));
-        }
-
-        public void AddToStringBuilder(StringBuilder sb)
-        {
-            string formatString = GetFormatString();
-//            System.Console.WriteLine("FORMAT STRING [{0}]", formatString);
-
-            // columns
-            sb.AppendFormat(formatString, Columns.ConvertAll(c => c.Header).ToArray());
-
-            // rows
-            foreach (ConsoleDisplayTableRow row in Rows)
-                sb.AppendFormat(formatString, row.Cells.ToArray());
-        }
-
-        /// <summary>
-        /// Gets the format string for the table.
-        /// </summary>
-        private string GetFormatString()
-        {
-            StringBuilder formatSb = new StringBuilder();
-
-            formatSb.Append(' ', Indent);
-
-            for (int i = 0; i < Columns.Count; i++)
-            {
-                formatSb.Append(' ', TableSpacing);
-
-                // Can only do left formatting for now
-                formatSb.AppendFormat("{{{0},-{1}}}", i, Columns[i].Width);
-            }
-
-            formatSb.Append('\n');
-
-            return formatSb.ToString();
-        }
-    }
-
-    public struct ConsoleDisplayTableColumn
-    {
-        public string Header { get; set; }
-        public int Width { get; set; }
-
-        public ConsoleDisplayTableColumn(string header, int width) : this()
-        {
-            Header = header;
-            Width = width;
-        }
-    }
-
-    public struct ConsoleDisplayTableRow
-    {
-        public List<string> Cells { get; private set; }
-
-        public ConsoleDisplayTableRow(List<string> cells) : this()
-        {
-            Cells = cells;
-        }
-
-        public ConsoleDisplayTableRow(params string[] cells) : this()
-        {
-            Cells = new List<string>(cells);
-        }
-    }
-}

OpenSim/Framework/Console/LocalConsole.cs

@@ -296,10 +296,6 @@ namespace OpenSim.Framework.Console
                             matches[0].Groups["Category"].Value);
                     System.Console.Write("]:");
                 }
-                else
-                {
-                    outText = outText.Trim();
-                }
             }
 
             if (level == "error")
@@ -319,8 +315,6 @@ namespace OpenSim.Framework.Console
 
         public override void Output(string text, string level)
         {
-            FireOnOutput(text);
-
             lock (m_commandLine)
             {
                 if (m_cursorYPosition == -1)
@@ -511,4 +505,4 @@ namespace OpenSim.Framework.Console
             }
         }
     }
-}
+}

OpenSim/Framework/Console/MockConsole.cs

@@ -29,7 +29,6 @@ using System;
 using System.Threading;
 using System.Collections.Generic;
 using System.Text;
-using System.Xml;
 
 namespace OpenSim.Framework.Console
 {
@@ -38,44 +37,28 @@ namespace OpenSim.Framework.Console
     /// Don't use this except for Unit Testing or you're in for a world of hurt when the 
     /// sim gets to ReadLine
     /// </summary>
-    public class MockConsole : ICommandConsole
+    public class MockConsole : CommandConsole
     {
-        public event OnOutputDelegate OnOutput;
+        public MockConsole(string defaultPrompt) : base(defaultPrompt)
+        {
+        }
+        public override void Output(string text)
+        {
+        }
+        public override void Output(string text, string level)
+        {
+        }
 
-        private MockCommands m_commands = new MockCommands();
-
-        public ICommands Commands { get { return m_commands; } }
-
-        public void Prompt() {}
-
-        public void RunCommand(string cmd) {}
-
-        public string ReadLine(string p, bool isCommand, bool e) { return ""; }
-
-        public object ConsoleScene { get { return null; } }
-
-        public void Output(string text, string level) {}
-        public void Output(string text) {}
-        public void OutputFormat(string format, params object[] components) {}
-
-        public string CmdPrompt(string p) { return ""; }
-        public string CmdPrompt(string p, string def) { return ""; }
-        public string CmdPrompt(string p, List<char> excludedCharacters) { return ""; }
-        public string CmdPrompt(string p, string def, List<char> excludedCharacters) { return ""; }
-
-        public string CmdPrompt(string prompt, string defaultresponse, List<string> options) { return ""; }
-
-        public string PasswdPrompt(string p) { return ""; }
-    }
-
-    public class MockCommands : ICommands
-    {
-        public void FromXml(XmlElement root, CommandDelegate fn) {}
-        public List<string> GetHelp(string[] cmd) { return null; }
-        public void AddCommand(string module, bool shared, string command, string help, string longhelp, CommandDelegate fn) {}
-        public void AddCommand(string module, bool shared, string command, string help, string longhelp, string descriptivehelp, CommandDelegate fn) {}
-        public string[] FindNextOption(string[] cmd, bool term) { return null; }
-        public string[] Resolve(string[] cmd) { return null; }
-        public XmlElement GetXml(XmlDocument doc) { return null; }
+        public override string ReadLine(string p, bool isCommand, bool e)
+        {
+            //Thread.CurrentThread.Join(1000);
+            return string.Empty;
+        }
+        public override void UnlockOutput()
+        {
+        }
+        public override void LockOutput()
+        {
+        }
     }
 }

OpenSim/Framework/Console/RemoteConsole.cs

@@ -100,7 +100,6 @@ namespace OpenSim.Framework.Console
                 m_LineNumber++;
                 m_Scrollback.Add(String.Format("{0}", m_LineNumber)+":"+level+":"+text);
             }
-            FireOnOutput(text.Trim());
             System.Console.WriteLine(text.Trim());
         }
 
@@ -233,8 +232,9 @@ namespace OpenSim.Framework.Console
 
             string uri = "/ReadResponses/" + sessionID.ToString() + "/";
 
-            m_Server.AddPollServiceHTTPHandler(
-                uri, new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, sessionID));
+            m_Server.AddPollServiceHTTPHandler(uri, HandleHttpPoll,
+                    new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents,
+                    sessionID));
 
             XmlDocument xmldoc = new XmlDocument();
             XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration,
@@ -266,6 +266,11 @@ namespace OpenSim.Framework.Console
             return reply;
         }
 
+        private Hashtable HandleHttpPoll(Hashtable request)
+        {
+            return new Hashtable();
+        }
+
         private Hashtable HandleHttpCloseSession(Hashtable request)
         {
             DoExpire();

OpenSim/Framework/EstateSettings.cs

@@ -322,7 +322,7 @@ namespace OpenSim.Framework
                 l_EstateManagers.Remove(avatarID);
         }
 
-        public bool IsEstateManagerOrOwner(UUID avatarID)
+        public bool IsEstateManager(UUID avatarID)
         {
             if (IsEstateOwner(avatarID))
                 return true;
@@ -368,16 +368,10 @@ namespace OpenSim.Framework
 
         public bool HasAccess(UUID user)
         {
-            if (IsEstateManagerOrOwner(user))
+            if (IsEstateManager(user))
                 return true;
 
             return l_EstateAccess.Contains(user);
         }
-
-        public bool GroupAccess(UUID groupID)
-        {
-            return l_EstateGroups.Contains(groupID);
-        }
-
     }
 }

OpenSim/Framework/IClientAPI.cs

@@ -53,7 +53,8 @@ namespace OpenSim.Framework
 
     public delegate ISceneEntity RezSingleAttachmentFromInv(IClientAPI remoteClient, UUID itemID, uint AttachmentPt);
 
-    public delegate void RezMultipleAttachmentsFromInv(IClientAPI remoteClient, List<KeyValuePair<UUID, uint>> rezlist );
+    public delegate void RezMultipleAttachmentsFromInv(IClientAPI remoteClient, RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header,
+                                                       RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects);
 
     public delegate void ObjectAttach(
         IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent);
@@ -84,8 +85,6 @@ namespace OpenSim.Framework
     public delegate void TeleportLandmarkRequest(
         IClientAPI remoteClient, AssetLandmark lm);
 
-    public delegate void TeleportCancel(IClientAPI remoteClient);
-
     public delegate void DisconnectUser();
 
     public delegate void RequestAvatarProperties(IClientAPI remoteClient, UUID avatarID);
@@ -177,7 +176,7 @@ namespace OpenSim.Framework
 
     public delegate void ParcelAccessListUpdateRequest(UUID agentID, uint flags,
                     int landLocalID, UUID transactionID, int sequenceID,
-                    int sections, List<LandAccessEntry> entries,
+                    int sections, List<ParcelManager.ParcelAccessEntry> entries,
                     IClientAPI remote_client);
 
     public delegate void ParcelPropertiesRequest(
@@ -296,9 +295,9 @@ namespace OpenSim.Framework
     public delegate void ConfirmXfer(IClientAPI remoteClient, ulong xferID, uint packetID);
 
     public delegate void FriendActionDelegate(
-        IClientAPI remoteClient, UUID transactionID, List<UUID> callingCardFolders);
+        IClientAPI remoteClient, UUID agentID, UUID transactionID, List<UUID> callingCardFolders);
 
-    public delegate void FriendshipTermination(IClientAPI remoteClient, UUID ExID);
+    public delegate void FriendshipTermination(IClientAPI remoteClient, UUID agentID, UUID ExID);
 
     public delegate void MoneyTransferRequest(
         UUID sourceID, UUID destID, int amount, int transactionType, string description);
@@ -358,8 +357,6 @@ namespace OpenSim.Framework
 
     public delegate void EstateChangeInfo(IClientAPI client, UUID invoice, UUID senderID, UInt32 param1, UInt32 param2);
 
-    public delegate void EstateManageTelehub(IClientAPI client, UUID invoice, UUID senderID, string cmd, UInt32 param1);
-
     public delegate void RequestTerrain(IClientAPI remoteClient, string clientFileName);
 
     public delegate void BakeTerrain(IClientAPI remoteClient);
@@ -458,7 +455,7 @@ namespace OpenSim.Framework
     public delegate void AvatarNotesUpdate(IClientAPI client, UUID targetID, string notes);
     public delegate void MuteListRequest(IClientAPI client, uint muteCRC);
     public delegate void AvatarInterestUpdate(IClientAPI client, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages);
-    public delegate void GrantUserFriendRights(IClientAPI client, UUID target, int rights);
+    public delegate void GrantUserFriendRights(IClientAPI client, UUID requester, UUID target, int rights);
     public delegate void PlacesQuery(UUID QueryID, UUID TransactionID, string QueryText, uint QueryFlags, byte Category, string SimName, IClientAPI client);
 
     public delegate void AgentFOV(IClientAPI client, float verticalAngle);
@@ -710,7 +707,7 @@ namespace OpenSim.Framework
         /// The scene agent for this client.  This will only be set if the client has an agent in a scene (i.e. if it
         /// is connected).
         /// </summary>
-        ISceneAgent SceneAgent { get; set; }
+        ISceneAgent SceneAgent { get; }
 
         UUID SessionId { get; }
 
@@ -740,21 +737,14 @@ namespace OpenSim.Framework
         /// </summary>
         string Name { get; }
 
-        /// <summary>
-        /// True if the client is active (sending and receiving new UDP messages).  False if the client is being closed.
-        /// </summary>
+        /// <value>
+        /// Determines whether the client thread is doing anything or not.
+        /// </value>
         bool IsActive { get; set; }
 
-        /// <summary>
-        /// Set if the client is closing due to a logout request
-        /// </summary>
-        /// <remarks>
-        /// Do not use this flag if you want to know if the client is closing, since it will not be set in other
-        /// circumstances (e.g. if a child agent is closed or the agent is kicked off the simulator).  Use IsActive
-        /// instead with a IClientAPI.SceneAgent.IsChildAgent check if necessary.
-        ///
-        /// Only set for root agents.
-        /// </remarks>
+        /// <value>
+        /// Determines whether the client is or has been removed from a given scene
+        /// </value>
         bool IsLoggingOut { get; set; }
         
         bool SendLogoutPacketWhenClosing { set; }
@@ -778,7 +768,6 @@ namespace OpenSim.Framework
         event ModifyTerrain OnModifyTerrain;
         event BakeTerrain OnBakeTerrain;
         event EstateChangeInfo OnEstateChangeInfo;
-        event EstateManageTelehub OnEstateManageTelehub;
         // [Obsolete("LLClientView Specific.")]
         event SetAppearance OnSetAppearance;
         // [Obsolete("LLClientView Specific - Replace and rename OnAvatarUpdate. Difference from SetAppearance?")]
@@ -800,7 +789,6 @@ namespace OpenSim.Framework
         event RequestAvatarProperties OnRequestAvatarProperties;
         event SetAlwaysRun OnSetAlwaysRun;
         event TeleportLandmarkRequest OnTeleportLandmarkRequest;
-        event TeleportCancel OnTeleportCancel;
         event DeRezObject OnDeRezObject;
         event Action<IClientAPI> OnRegionHandShakeReply;
         event GenericCall1 OnRequestWearables;
@@ -1033,21 +1021,7 @@ namespace OpenSim.Framework
 
         void InPacket(object NewPack);
         void ProcessInPacket(Packet NewPack);
-
-        /// <summary>
-        /// Close this client
-        /// </summary>
         void Close();
-
-        /// <summary>
-        /// Close this client
-        /// </summary>
-        /// <param name='force'>
-        /// If true, attempts the close without checking active status.  You do not want to try this except as a last
-        /// ditch attempt where Active == false but the ScenePresence still exists.
-        /// </param>
-        void Close(bool force);
-
         void Kick(string message);
         
         /// <summary>
@@ -1079,7 +1053,7 @@ namespace OpenSim.Framework
         /// </summary>
         /// <param name="regionHandle"></param>
         /// <param name="localID"></param>
-        void SendKillObject(ulong regionHandle, List<uint> localID);
+        void SendKillObject(ulong regionHandle, uint localID);
 
         void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs);
         void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args);
@@ -1098,15 +1072,7 @@ namespace OpenSim.Framework
         void SendWindData(Vector2[] windSpeeds);
         void SendCloudData(float[] cloudCover);
 
-        /// <summary>
-        /// Sent when an agent completes its movement into a region.
-        /// </summary>
-        /// <remarks>
-        /// This packet marks completion of the arrival of a root avatar in a region, whether through login, region
-        /// crossing or direct teleport.
-        /// </remarks>
         void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look);
-
         void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint);
         
         /// <summary>
@@ -1165,8 +1131,6 @@ namespace OpenSim.Framework
 
         void SendTaskInventory(UUID taskID, short serial, byte[] fileName);
 
-        void SendTelehubInfo(UUID ObjectID, string ObjectName, Vector3 ObjectPos, Quaternion ObjectRot, List<Vector3> SpawnPoint);
-
         /// <summary>
         /// Used by the server to inform the client of new inventory items and folders.
         /// </summary>
@@ -1236,9 +1200,10 @@ namespace OpenSim.Framework
         /// <param name="OrbitalPosition">The orbital position is given in radians, and must be "adjusted" for the linden client, see LLClientView</param>
         void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong CurrentTime, uint SecondsPerSunCycle, uint SecondsPerYear,
                         float OrbitalPosition);
-        
+
         void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks);
         void SendViewerTime(int phase);
+        UUID GetDefaultAnimation(string name);
 
         void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] charterMember, string flAbout,
                                   uint flags, UUID flImageID, UUID imageID, string profileURL, UUID partnerID);
@@ -1255,7 +1220,7 @@ namespace OpenSim.Framework
         void SendEstateCovenantInformation(UUID covenant);
 
         void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags,
-                                    uint sunPosition, UUID covenant, uint covenantChanged, string abuseEmail, UUID estateOwner);
+                                    uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner);
 
         /// <summary>
         /// Send land properties to the client.
@@ -1271,7 +1236,7 @@ namespace OpenSim.Framework
                                 float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity,
                                 uint regionFlags);
 
-        void SendLandAccessListData(List<LandAccessEntry> accessList, uint accessFlag, int localLandID);
+        void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID);
         void SendForceClientSelectObjects(List<uint> objectIDs);
         void SendCameraConstraint(Vector4 ConstraintPlane);
         void SendLandObjectOwners(LandData land, List<UUID> groups, Dictionary<UUID, int> ownersAndCount);
@@ -1367,6 +1332,7 @@ namespace OpenSim.Framework
         void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message);
 
         void SendLogoutPacket();
+        EndPoint GetClientEP();
 
         // WARNING WARNING WARNING
         //
@@ -1427,6 +1393,8 @@ namespace OpenSim.Framework
 
         void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes);
 
+        void KillEndDone();
+
         bool AddGenericPacketHandler(string MethodName, GenericMessage handler);
 
         void SendRebakeAvatarTextures(UUID textureID);

OpenSim/Framework/ICommandConsole.cs

@@ -40,7 +40,7 @@ namespace OpenSim.Framework
         /// <summary>
         /// Get help for the given help string
         /// </summary>
-        /// <param name="cmd">Parsed parts of the help string.  If empty then general help is returned.</param>
+        /// <param name="helpParts">Parsed parts of the help string.  If empty then general help is returned.</param>
         /// <returns></returns>
         List<string> GetHelp(string[] cmd);
 
@@ -74,12 +74,8 @@ namespace OpenSim.Framework
         XmlElement GetXml(XmlDocument doc);
     }
 
-    public delegate void OnOutputDelegate(string message);
-
     public interface ICommandConsole : IConsole
     {
-        event OnOutputDelegate OnOutput;
-
         ICommands Commands { get; }
 
         /// <summary>
@@ -91,4 +87,4 @@ namespace OpenSim.Framework
 
         string ReadLine(string p, bool isCommand, bool e);
     }
-}
+}

OpenSim/Framework/ILandObject.cs

@@ -71,12 +71,11 @@ namespace OpenSim.Framework
         bool IsEitherBannedOrRestricted(UUID avatar);
         bool IsBannedFromLand(UUID avatar);
         bool IsRestrictedFromLand(UUID avatar);
-        bool IsInLandAccessList(UUID avatar);
         void SendLandUpdateToClient(IClientAPI remote_client);
         void SendLandUpdateToClient(bool snap_selection, IClientAPI remote_client);
-        List<LandAccessEntry> CreateAccessListArrayByFlag(AccessList flag);
+        List<UUID> CreateAccessListArrayByFlag(AccessList flag);
         void SendAccessList(UUID agentID, UUID sessionID, uint flags, int sequenceID, IClientAPI remote_client);
-        void UpdateAccessList(uint flags, UUID transactionID, int sequenceID, int sections, List<LandAccessEntry> entries, IClientAPI remote_client);
+        void UpdateAccessList(uint flags, UUID transactionID, int sequenceID, int sections, List<ParcelManager.ParcelAccessEntry> entries, IClientAPI remote_client);
         void UpdateLandBitmapByteArray();
         void SetLandBitmapFromByteArray();
         bool[,] GetLandBitmap();
@@ -131,11 +130,5 @@ namespace OpenSim.Framework
         /// </summary>
         /// <param name="url"></param>
         void SetMusicUrl(string url);
-
-        /// <summary>
-        /// Get the music url for this land parcel
-        /// </summary>
-        /// <returns>The music url.</returns>
-        string GetMusicUrl();
     }
 }

OpenSim/Framework/IMoneyModule.cs

@@ -36,8 +36,8 @@ namespace OpenSim.Framework
                 int amount);
 
         int GetBalance(UUID agentID);
-        bool UploadCovered(UUID agentID, int amount);
-        bool AmountCovered(UUID agentID, int amount);
+        bool UploadCovered(IClientAPI client, int amount);
+        bool AmountCovered(IClientAPI client, int amount);
         void ApplyCharge(UUID agentID, int amount, string text);
         void ApplyUploadCharge(UUID agentID, int amount, string text);
 

OpenSim/Framework/IScene.cs

@@ -56,29 +56,11 @@ namespace OpenSim.Framework
 
     public interface IScene
     {
-        /// <summary>
-        /// The name of this scene.
-        /// </summary>
-        string Name { get; }
-
         RegionInfo RegionInfo { get; }
         RegionStatus RegionStatus { get; set; }
 
         IConfigSource Config { get; }
 
-        /// <summary>
-        /// Are logins enabled on this simulator?
-        /// </summary>
-        bool LoginsEnabled { get; set; }
-
-        /// <summary>
-        /// Is this region ready for use?
-        /// </summary>
-        /// <remarks>
-        /// This does not mean that logins are enabled, merely that they can be.
-        /// </remarks>
-        bool Ready { get; set; }
-
         float TimeDilation { get; }
 
         bool AllowScriptCrossings { get; }

OpenSim/Framework/ISceneAgent.cs

@@ -26,7 +26,6 @@
  */
 
 using System;
-using OpenMetaverse;
 
 namespace OpenSim.Framework
 {
@@ -72,11 +71,5 @@ namespace OpenSim.Framework
         /// This includes scene object data and the appearance data of other avatars.
         /// </remarks>
         void SendInitialDataToMe();
-
-        /// <summary>
-        /// Direction in which the scene presence is looking.
-        /// </summary>
-        /// <remarks>Will be Vector3.Zero for a child agent.</remarks>
-        Vector3 Lookat { get; }        
     }
 }

OpenSim/Framework/InventoryFolderBase.cs

@@ -73,27 +73,33 @@ namespace OpenSim.Framework
         {
         }
 
-        public InventoryFolderBase(UUID id) : this()
+        public InventoryFolderBase(UUID id)
         {
             ID = id;
         }
 
-        public InventoryFolderBase(UUID id, UUID owner) : this(id)
+        public InventoryFolderBase(UUID id, UUID owner)
         {
+            ID = id;
             Owner = owner;
         }
 
-        public InventoryFolderBase(UUID id, string name, UUID owner, UUID parent) : this(id, owner)
+        public InventoryFolderBase(UUID id, string name, UUID owner, UUID parent)
         {
+            ID = id;
             Name = name;
+            Owner = owner;
             ParentID = parent;
         }
 
-        public InventoryFolderBase(
-            UUID id, string name, UUID owner, short type, UUID parent, ushort version) : this(id, name, owner, parent)
+        public InventoryFolderBase(UUID id, string name, UUID owner, short type, UUID parent, ushort version)
         {
+            ID = id;
+            Name = name;
+            Owner = owner;
             Type = type;
+            ParentID = parent;
             Version = version;
         }
     }
-}
+}

OpenSim/Framework/LandData.cs

@@ -34,13 +34,6 @@ using OpenMetaverse;
 
 namespace OpenSim.Framework
 {
-    public class LandAccessEntry
-    {
-        public UUID AgentID;
-        public int Expires;
-        public AccessList Flags;
-    }
-
     /// <summary>
     /// Details of a Parcel of land
     /// </summary>
@@ -69,7 +62,7 @@ namespace OpenSim.Framework
                                 (uint) ParcelFlags.AllowAPrimitiveEntry |
                                 (uint) ParcelFlags.AllowDeedToGroup | (uint) ParcelFlags.AllowTerraform |
                                 (uint) ParcelFlags.CreateObjects | (uint) ParcelFlags.AllowOtherScripts |
-                                (uint) ParcelFlags.SoundLocal | (uint) ParcelFlags.AllowVoiceChat;
+                                (uint) ParcelFlags.SoundLocal;
 
         private byte _landingType = 0;
         private string _name = "Your Parcel";
@@ -80,7 +73,7 @@ namespace OpenSim.Framework
         private string _mediaURL = String.Empty;
         private string _musicURL = String.Empty;
         private UUID _ownerID = UUID.Zero;
-        private List<LandAccessEntry> _parcelAccessList = new List<LandAccessEntry>();
+        private List<ParcelManager.ParcelAccessEntry> _parcelAccessList = new List<ParcelManager.ParcelAccessEntry>();
         private float _passHours = 0;
         private int _passPrice = 0;
         private int _salePrice = 0; //Unemeplemented. Parcels price.
@@ -457,7 +450,7 @@ namespace OpenSim.Framework
         /// <summary>
         /// List of access data for the parcel.  User data, some bitflags, and a time
         /// </summary>
-        public List<LandAccessEntry> ParcelAccessList {
+        public List<ParcelManager.ParcelAccessEntry> ParcelAccessList {
             get {
                 return _parcelAccessList;
             }
@@ -645,12 +638,12 @@ namespace OpenSim.Framework
             landData._simwidePrims = _simwidePrims;
 
             landData._parcelAccessList.Clear();
-            foreach (LandAccessEntry entry in _parcelAccessList)
+            foreach (ParcelManager.ParcelAccessEntry entry in _parcelAccessList)
             {
-                LandAccessEntry newEntry = new LandAccessEntry();
+                ParcelManager.ParcelAccessEntry newEntry = new ParcelManager.ParcelAccessEntry();
                 newEntry.AgentID = entry.AgentID;
                 newEntry.Flags = entry.Flags;
-                newEntry.Expires = entry.Expires;
+                newEntry.Time = entry.Time;
 
                 landData._parcelAccessList.Add(newEntry);
             }
@@ -675,4 +668,4 @@ namespace OpenSim.Framework
             return land;
         }
     }
-}
+}

OpenSim/Framework/LocklessQueue.cs

@@ -99,13 +99,8 @@ namespace OpenSim.Framework
                     }
                     else
                     {
-                        item = oldHeadNext.Item;                       
+                        item = oldHeadNext.Item;
                         haveAdvancedHead = CAS(ref head, oldHead, oldHeadNext);
-                        if (haveAdvancedHead)
-                        {
-                            oldHeadNext.Item = default(T);
-                            oldHead.Next = null;
-                        }
                     }
                 }
             }
@@ -116,10 +111,6 @@ namespace OpenSim.Framework
 
         public void Clear()
         {
-            // ugly
-            T item;
-            while(count > 0)
-                Dequeue(out item);
             Init();
         }
 

OpenSim/Framework/MinHeap.cs

@@ -62,16 +62,13 @@ namespace OpenSim.Framework
             }
 
             internal void Clear()
-            {
-                if (this.handle != null)
-                    this.handle.Clear();
-                ClearRef();
-            }
-
-            internal void ClearRef()
             {
                 this.value = default(T);
-                this.handle = null;
+                if (this.handle != null)
+                {
+                    this.handle.Clear();
+                    this.handle = null;
+                }
             }
         }
 
@@ -288,7 +285,6 @@ namespace OpenSim.Framework
             if (--this.size > 0 && index != this.size)
             {
                 Set(this.items[this.size], index);
-                this.items[this.size].ClearRef();
                 if (!BubbleUp(index))
                     BubbleDown(index);
             }

OpenSim/Framework/Monitoring/MemoryWatchdog.cs

@@ -1,129 +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.Linq;
-using System.Reflection;
-using System.Threading;
-using log4net;
-
-namespace OpenSim.Framework.Monitoring
-{
-    /// <summary>
-    /// Experimental watchdog for memory usage.
-    /// </summary>
-    public static class MemoryWatchdog
-    {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        /// <summary>
-        /// Is this watchdog active?
-        /// </summary>
-        public static bool Enabled
-        {
-            get { return m_enabled; }
-            set
-            {
-//                m_log.DebugFormat("[MEMORY WATCHDOG]: Setting MemoryWatchdog.Enabled to {0}", value);
-
-                if (value && !m_enabled)
-                    UpdateLastRecord(GC.GetTotalMemory(false), Util.EnvironmentTickCount());
-
-                m_enabled = value;
-            }
-        }
-        private static bool m_enabled;
-
-        /// <summary>
-        /// Average memory churn in bytes per millisecond.
-        /// </summary>
-        public static double AverageMemoryChurn
-        {
-            get { if (m_samples.Count > 0) return m_samples.Average(); else return 0; }
-        }
-
-        /// <summary>
-        /// Maximum number of statistical samples.
-        /// </summary>
-        /// <remarks>
-        /// At the moment this corresponds to 1 minute since the sampling rate is every 2.5 seconds as triggered from
-        /// the main Watchdog.
-        /// </remarks>
-        private static int m_maxSamples = 24;
-
-        /// <summary>
-        /// Time when the watchdog was last updated.
-        /// </summary>
-        private static int m_lastUpdateTick;
-
-        /// <summary>
-        /// Memory used at time of last watchdog update.
-        /// </summary>
-        private static long m_lastUpdateMemory;
-
-        /// <summary>
-        /// Memory churn rate per millisecond.
-        /// </summary>
-//        private static double m_churnRatePerMillisecond;
-
-        /// <summary>
-        /// Historical samples for calculating moving average.
-        /// </summary>
-        private static Queue<double> m_samples = new Queue<double>(m_maxSamples);
-
-        public static void Update()
-        {
-            int now = Util.EnvironmentTickCount();
-            long memoryNow = GC.GetTotalMemory(false);
-            long memoryDiff = memoryNow - m_lastUpdateMemory;
-
-            if (memoryDiff >= 0)
-            {
-                if (m_samples.Count >= m_maxSamples)
-                    m_samples.Dequeue();
-
-                double elapsed = Util.EnvironmentTickCountSubtract(now, m_lastUpdateTick);
-
-                // This should never happen since it's not useful for updates to occur with no time elapsed, but
-                // protect ourselves from a divide-by-zero just in case.
-                if (elapsed == 0)
-                    return;
-
-                m_samples.Enqueue(memoryDiff / (double)elapsed);
-            }
-
-            UpdateLastRecord(memoryNow, now);
-        }
-
-        private static void UpdateLastRecord(long memoryNow, int timeNow)
-        {
-            m_lastUpdateMemory = memoryNow;
-            m_lastUpdateTick = timeNow;
-        }
-    }
-}

OpenSim/Framework/MultipartForm.cs

@@ -119,7 +119,7 @@ namespace OpenSim.Framework
                 // Copy the temporary stream to the network stream
                 formDataStream.Seek(0, SeekOrigin.Begin);
                 using (Stream requestStream = request.GetRequestStream())
-                    formDataStream.CopyStream(requestStream, (int)formDataStream.Length);
+                    formDataStream.CopyTo(requestStream, (int)formDataStream.Length);
             }
 
             #endregion Stream Writing

OpenSim/Framework/OSChatMessage.cs

@@ -51,12 +51,10 @@ namespace OpenSim.Framework
         protected object m_senderObject;
         protected ChatTypeEnum m_type;
         protected UUID m_fromID;
-        protected UUID m_toID;
 
         public OSChatMessage()
         {
             m_position = new Vector3();
-            m_toID = UUID.Zero;
         }
 
         /// <summary>
@@ -104,15 +102,6 @@ namespace OpenSim.Framework
             set { m_from = value; }
         }
 
-        /// <summary>
-        /// The name of the sender (needed for scripts)
-        /// </summary>
-        public string To
-        {
-            get { return m_from; }
-            set { m_from = value; }
-        }
-
         #region IEventArgs Members
 
         /// TODO: Sender and SenderObject should just be Sender and of
@@ -142,15 +131,6 @@ namespace OpenSim.Framework
             set { m_fromID = value; }
         }
 
-        /// <summary>
-        /// The single recipient or all if not set.
-        /// </summary>
-        public UUID TargetUUID
-        {
-            get { return m_toID; }
-            set { m_toID = value; }
-        }
-
         /// <summary>
         ///
         /// </summary>

OpenSim/Framework/PrimitiveBaseShape.cs

@@ -241,14 +241,10 @@ namespace OpenSim.Framework
 
             m_textureEntry = prim.Textures.GetBytes();
 
-            if (prim.Sculpt != null)
-            {
-                SculptEntry = (prim.Sculpt.Type != OpenMetaverse.SculptType.None);
-                SculptData = prim.Sculpt.GetBytes();
-                SculptTexture = prim.Sculpt.SculptTexture;
-                SculptType = (byte)prim.Sculpt.Type;
-            }
-            else SculptType = (byte)OpenMetaverse.SculptType.None;
+            SculptEntry = (prim.Sculpt.Type != OpenMetaverse.SculptType.None);
+            SculptData = prim.Sculpt.GetBytes();
+            SculptTexture = prim.Sculpt.SculptTexture;
+            SculptType = (byte)prim.Sculpt.Type;
         }
 
         [XmlIgnore]

OpenSim/Framework/RegionInfo.cs

@@ -120,9 +120,7 @@ namespace OpenSim.Framework
         public UUID lastMapUUID = UUID.Zero;
         public string lastMapRefresh = "0";
 
-        private float m_nonphysPrimMin = 0;
         private int m_nonphysPrimMax = 0;
-        private float m_physPrimMin = 0;
         private int m_physPrimMax = 0;
         private bool m_clampPrimSize = false;
         private int m_objectCapacity = 0;
@@ -143,8 +141,6 @@ namespace OpenSim.Framework
         public string RemotingAddress;
         public UUID ScopeID = UUID.Zero;
 
-        private Dictionary<String, String> m_otherSettings = new Dictionary<string, string>();
-
 
         // Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
 
@@ -287,21 +283,11 @@ namespace OpenSim.Framework
             set { m_windlight = value; }
         }
 
-        public float NonphysPrimMin
-        {
-            get { return m_nonphysPrimMin; }
-        }
-
         public int NonphysPrimMax
         {
             get { return m_nonphysPrimMax; }
         }
 
-        public float PhysPrimMin
-        {
-            get { return m_physPrimMin; }
-        }
-
         public int PhysPrimMax
         {
             get { return m_physPrimMax; }
@@ -433,18 +419,12 @@ namespace OpenSim.Framework
             set { m_internalEndPoint = value; }
         }
 
-        /// <summary>
-        /// The x co-ordinate of this region in map tiles (e.g. 1000).
-        /// </summary>
         public uint RegionLocX
         {
             get { return m_regionLocX.Value; }
             set { m_regionLocX = value; }
         }
 
-        /// <summary>
-        /// The y co-ordinate of this region in map tiles (e.g. 1000).
-        /// </summary>
         public uint RegionLocY
         {
             get { return m_regionLocY.Value; }
@@ -463,22 +443,6 @@ namespace OpenSim.Framework
             m_internalEndPoint = tmpEPE;
         }
 
-        public string GetOtherSetting(string key)
-        {
-            string val;
-            string keylower = key.ToLower();
-            if (m_otherSettings.TryGetValue(keylower, out val))
-                return val;
-            m_log.DebugFormat("[RegionInfo] Could not locate value for parameter {0}", key);
-            return null;
-        }
-
-        public void SetOtherSetting(string key, string value)
-        {
-            string keylower = key.ToLower();
-            m_otherSettings[keylower] = value;
-        }
-
         private void ReadNiniConfig(IConfigSource source, string name)
         {
 //            bool creatingNew = false;
@@ -492,16 +456,9 @@ namespace OpenSim.Framework
                 MainConsole.Instance.Output("=====================================\n");
 
                 if (name == String.Empty)
-                {
-                    while (name.Trim() == string.Empty)
-                    {
-                        name = MainConsole.Instance.CmdPrompt("New region name", name);
-                        if (name.Trim() == string.Empty)
-                        {
-                            MainConsole.Instance.Output("Cannot interactively create region with no name");
-                        }
-                    }
-                }
+                    name = MainConsole.Instance.CmdPrompt("New region name", name);
+                if (name == String.Empty)
+                    throw new Exception("Cannot interactively create region with no name");
 
                 source.AddConfig(name);
 
@@ -514,44 +471,30 @@ namespace OpenSim.Framework
             if (source.Configs[name] == null)
             {
                 source.AddConfig(name);
+
+//                creatingNew = true;
             }
 
-            RegionName = name;
             IConfig config = source.Configs[name];
 
-            // Track all of the keys in this config and remove as they are processed
-            // The remaining keys will be added to generic key-value storage for
-            // whoever might need it
-            HashSet<String> allKeys = new HashSet<String>();
-            foreach (string s in config.GetKeys())
-            {
-                allKeys.Add(s);
-            }
-
-            // RegionUUID
+            // UUID
             //
-            allKeys.Remove("RegionUUID");
             string regionUUID = config.GetString("RegionUUID", string.Empty);
-            if (!UUID.TryParse(regionUUID.Trim(), out RegionID))
+
+            if (regionUUID == String.Empty)
             {
                 UUID newID = UUID.Random();
-                while (RegionID == UUID.Zero)
-                {
-                    regionUUID = MainConsole.Instance.CmdPrompt("RegionUUID", newID.ToString());
-                    if (!UUID.TryParse(regionUUID.Trim(), out RegionID))
-                    {
-                        MainConsole.Instance.Output("RegionUUID must be a valid UUID");
-                    }
-                }
+
+                regionUUID = MainConsole.Instance.CmdPrompt("Region UUID", newID.ToString());
                 config.Set("RegionUUID", regionUUID);
             }
 
-            originRegionID = RegionID; // What IS this?! (Needed for RegionCombinerModule?)
+            RegionID = new UUID(regionUUID);
+            originRegionID = RegionID; // What IS this?!
 
-            // Location
-            //
-            allKeys.Remove("Location");
+            RegionName = name;
             string location = config.GetString("Location", String.Empty);
+
             if (location == String.Empty)
             {
                 location = MainConsole.Instance.CmdPrompt("Region Location", "1000,1000");
@@ -563,10 +506,9 @@ namespace OpenSim.Framework
             m_regionLocX = Convert.ToUInt32(locationElements[0]);
             m_regionLocY = Convert.ToUInt32(locationElements[1]);
 
-            // InternalAddress
-            //
+            // Internal IP
             IPAddress address;
-            allKeys.Remove("InternalAddress");
+
             if (config.Contains("InternalAddress"))
             {
                 address = IPAddress.Parse(config.GetString("InternalAddress", String.Empty));
@@ -577,10 +519,8 @@ namespace OpenSim.Framework
                 config.Set("InternalAddress", address.ToString());
             }
 
-            // InternalPort
-            //
             int port;
-            allKeys.Remove("InternalPort");
+
             if (config.Contains("InternalPort"))
             {
                 port = config.GetInt("InternalPort", 9000);
@@ -590,11 +530,9 @@ namespace OpenSim.Framework
                 port = Convert.ToInt32(MainConsole.Instance.CmdPrompt("Internal port", "9000"));
                 config.Set("InternalPort", port);
             }
+
             m_internalEndPoint = new IPEndPoint(address, port);
 
-            // AllowAlternatePorts
-            //
-            allKeys.Remove("AllowAlternatePorts");
             if (config.Contains("AllowAlternatePorts"))
             {
                 m_allow_alternate_ports = config.GetBoolean("AllowAlternatePorts", true);
@@ -606,10 +544,10 @@ namespace OpenSim.Framework
                 config.Set("AllowAlternatePorts", m_allow_alternate_ports.ToString());
             }
 
-            // ExternalHostName
+            // External IP
             //
-            allKeys.Remove("ExternalHostName");
             string externalName;
+
             if (config.Contains("ExternalHostName"))
             {
                 externalName = config.GetString("ExternalHostName", "SYSTEMIP");
@@ -619,6 +557,7 @@ namespace OpenSim.Framework
                 externalName = MainConsole.Instance.CmdPrompt("External host name", "SYSTEMIP");
                 config.Set("ExternalHostName", externalName);
             }
+
             if (externalName == "SYSTEMIP")
             {
                 m_externalHostName = Util.GetLocalHost().ToString();
@@ -631,44 +570,24 @@ namespace OpenSim.Framework
                 m_externalHostName = externalName;
             }
 
-            // RegionType
             m_regionType = config.GetString("RegionType", String.Empty);
-            allKeys.Remove("RegionType");
 
-            #region Prim stuff
+            // Prim stuff
+            //
+            m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 256);
 
-            m_nonphysPrimMin = config.GetFloat("NonphysicalPrimMin", 0);
-            allKeys.Remove("NonphysicalPrimMin");
+            m_physPrimMax = config.GetInt("PhysicalPrimMax", 10);
 
-            m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 0);
-            allKeys.Remove("NonphysicalPrimMax");
-
-            m_physPrimMin = config.GetFloat("PhysicalPrimMin", 0);
-            allKeys.Remove("PhysicalPrimMin");
-
-            m_physPrimMax = config.GetInt("PhysicalPrimMax", 0);
-            allKeys.Remove("PhysicalPrimMax");
-            
             m_clampPrimSize = config.GetBoolean("ClampPrimSize", false);
-            allKeys.Remove("ClampPrimSize");
-            
+
             m_objectCapacity = config.GetInt("MaxPrims", 15000);
-            allKeys.Remove("MaxPrims");
-            
-            #endregion
 
             m_agentCapacity = config.GetInt("MaxAgents", 100);
-            allKeys.Remove("MaxAgents");
+
 
             // Multi-tenancy
             //
             ScopeID = new UUID(config.GetString("ScopeID", UUID.Zero.ToString()));
-            allKeys.Remove("ScopeID");
-
-            foreach (String s in allKeys)
-            {
-                SetOtherSetting(s, config.GetString(s));
-            }
         }
 
         private void WriteNiniConfig(IConfigSource source)
@@ -692,18 +611,10 @@ namespace OpenSim.Framework
 
             config.Set("ExternalHostName", m_externalHostName);
 
-            if (m_nonphysPrimMin != 0)
-                config.Set("NonphysicalPrimMax", m_nonphysPrimMin);
-
             if (m_nonphysPrimMax != 0)
                 config.Set("NonphysicalPrimMax", m_nonphysPrimMax);
-
-            if (m_physPrimMin != 0)
-                config.Set("PhysicalPrimMax", m_physPrimMin);
-            
             if (m_physPrimMax != 0)
                 config.Set("PhysicalPrimMax", m_physPrimMax);
-                        
             config.Set("ClampPrimSize", m_clampPrimSize.ToString());
 
             if (m_objectCapacity != 0)
@@ -786,15 +697,9 @@ namespace OpenSim.Framework
             configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
                                                 "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true);
 
-            configMember.addConfigurationOption("nonphysical_prim_min", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
-                                                "Minimum size for nonphysical prims", m_nonphysPrimMin.ToString(), true);
-
             configMember.addConfigurationOption("nonphysical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
                                                 "Maximum size for nonphysical prims", m_nonphysPrimMax.ToString(), true);
 
-            configMember.addConfigurationOption("physical_prim_min", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
-                                                "Minimum size for nonphysical prims", m_physPrimMin.ToString(), true);
-
             configMember.addConfigurationOption("physical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
                                                 "Maximum size for physical prims", m_physPrimMax.ToString(), true);
 

OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs

@@ -48,13 +48,11 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
         public RegionInfo[] LoadRegions()
         {
             string regionConfigPath = Path.Combine(Util.configDir(), "Regions");
-            bool allowRegionless = false;
 
             try
             {
                 IConfig startupConfig = (IConfig)m_configSource.Configs["Startup"];
                 regionConfigPath = startupConfig.GetString("regionload_regionsdir", regionConfigPath).Trim();
-                allowRegionless = startupConfig.GetBoolean("allow_regionless", false);
             }
             catch (Exception)
             {
@@ -70,7 +68,7 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
             string[] iniFiles = Directory.GetFiles(regionConfigPath, "*.ini");
 
             // Create an empty Regions.ini if there are no existing config files.
-            if (!allowRegionless && configFiles.Length == 0 && iniFiles.Length == 0)
+            if (configFiles.Length == 0 && iniFiles.Length == 0)
             {                
                 new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "Regions.ini"), false, m_configSource);
                 iniFiles = Directory.GetFiles(regionConfigPath, "*.ini");

OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs

@@ -57,8 +57,6 @@ namespace OpenSim.Framework.RegionLoader.Web
             {
                 IConfig startupConfig = (IConfig) m_configSource.Configs["Startup"];
                 string url = startupConfig.GetString("regionload_webserver_url", String.Empty).Trim();
-                bool allowRegionless = startupConfig.GetBoolean("allow_regionless", false);
-
                 if (url == String.Empty)
                 {
                     m_log.Error("[WEBLOADER]: Unable to load webserver URL - URL was empty.");
@@ -66,63 +64,37 @@ namespace OpenSim.Framework.RegionLoader.Web
                 }
                 else
                 {
-                    RegionInfo[] regionInfos = new RegionInfo[] {};
-                    int regionCount = 0;
                     HttpWebRequest webRequest = (HttpWebRequest) WebRequest.Create(url);
                     webRequest.Timeout = 30000; //30 Second Timeout
                     m_log.DebugFormat("[WEBLOADER]: Sending download request to {0}", url);
-
-                    try
+                    HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse();
+                    m_log.Debug("[WEBLOADER]: Downloading region information...");
+                    StreamReader reader = new StreamReader(webResponse.GetResponseStream());
+                    string xmlSource = String.Empty;
+                    string tempStr = reader.ReadLine();
+                    while (tempStr != null)
                     {
-                        HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse();
-                        m_log.Debug("[WEBLOADER]: Downloading region information...");
-                        StreamReader reader = new StreamReader(webResponse.GetResponseStream());
-                        string xmlSource = String.Empty;
-                        string tempStr = reader.ReadLine();
-                        while (tempStr != null)
-                        {
-                            xmlSource = xmlSource + tempStr;
-                            tempStr = reader.ReadLine();
-                        }
-                        m_log.Debug("[WEBLOADER]: Done downloading region information from server. Total Bytes: " +
-                                    xmlSource.Length);
-                        XmlDocument xmlDoc = new XmlDocument();
-                        xmlDoc.LoadXml(xmlSource);
-                        if (xmlDoc.FirstChild.Name == "Regions")
-                        {
-                            regionCount = xmlDoc.FirstChild.ChildNodes.Count;
-    
-                            if (regionCount > 0)
-                            {
-                                regionInfos = new RegionInfo[regionCount];
-                                int i;
-                                for (i = 0; i < xmlDoc.FirstChild.ChildNodes.Count; i++)
-                                {
-                                    m_log.Debug(xmlDoc.FirstChild.ChildNodes[i].OuterXml);
-                                    regionInfos[i] =
-                                        new RegionInfo("REGION CONFIG #" + (i + 1), xmlDoc.FirstChild.ChildNodes[i],false,m_configSource);
-                                }
-                            }
-                        }
+                        xmlSource = xmlSource + tempStr;
+                        tempStr = reader.ReadLine();
                     }
-                    catch (WebException ex)
+                    m_log.Debug("[WEBLOADER]: Done downloading region information from server. Total Bytes: " +
+                                xmlSource.Length);
+                    XmlDocument xmlDoc = new XmlDocument();
+                    xmlDoc.LoadXml(xmlSource);
+                    if (xmlDoc.FirstChild.Name == "Regions")
                     {
-                        if (((HttpWebResponse)ex.Response).StatusCode == HttpStatusCode.NotFound)
+                        RegionInfo[] regionInfos = new RegionInfo[xmlDoc.FirstChild.ChildNodes.Count];
+                        int i;
+                        for (i = 0; i < xmlDoc.FirstChild.ChildNodes.Count; i++)
                         {
-                            if (!allowRegionless)
-                                throw ex;
+                            m_log.Debug(xmlDoc.FirstChild.ChildNodes[i].OuterXml);
+                            regionInfos[i] =
+                                new RegionInfo("REGION CONFIG #" + (i + 1), xmlDoc.FirstChild.ChildNodes[i],false,m_configSource);
                         }
-                        else
-                            throw ex;
-                    }
 
-                    if (regionCount > 0 | allowRegionless)
                         return regionInfos;
-                    else
-                    {
-                        m_log.Error("[WEBLOADER]: No region configs were available.");
-                        return null;
                     }
+                    return null;
                 }
             }
         }

OpenSim/Framework/RegionSettings.cs

@@ -26,80 +26,11 @@
  */
 
 using System;
-using System.Collections.Generic;
 using System.IO;
 using OpenMetaverse;
-using System.Runtime.Serialization;
 
 namespace OpenSim.Framework
 {
-    public struct SpawnPoint
-    {
-        public float Yaw;
-        public float Pitch;
-        public float Distance;
-
-        public void SetLocation(Vector3 pos, Quaternion rot, Vector3 point)
-        {
-            // The point is an absolute position, so we need the relative
-            // location to the spawn point
-            Vector3 offset = point - pos;
-            Distance = Vector3.Mag(offset);
-
-            // Next we need to rotate this vector into the spawn point's
-            // coordinate system
-            rot.W = -rot.W;
-            offset = offset * rot;
-
-            Vector3 dir = Vector3.Normalize(offset);
-
-            // Get the bearing (yaw)
-            Yaw = (float)Math.Atan2(dir.Y, dir.X);
-
-            // Get the elevation (pitch)
-            Pitch = (float)-Math.Atan2(dir.Z, Math.Sqrt(dir.X * dir.X + dir.Y * dir.Y));
-        }
-
-        public Vector3 GetLocation(Vector3 pos, Quaternion rot)
-        {
-            Quaternion y = Quaternion.CreateFromEulers(0, 0, Yaw);
-            Quaternion p = Quaternion.CreateFromEulers(0, Pitch, 0);
-
-            Vector3 dir = new Vector3(1, 0, 0) * p * y;
-            Vector3 offset = dir * (float)Distance;
-
-            offset *= rot;
-
-            return pos + offset;
-        }
-
-        /// <summary>
-        /// Returns a string representation of this SpawnPoint.
-        /// </summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            return string.Format("{0},{1},{2}", Yaw, Pitch, Distance);
-        }
-
-        /// <summary>
-        /// Generate a SpawnPoint from a string
-        /// </summary>
-        /// <param name="str"></param>
-        public static SpawnPoint Parse(string str)
-        {
-            string[] parts = str.Split(',');
-            if (parts.Length != 3)
-                throw new ArgumentException("Invalid string: " + str);
-            
-            SpawnPoint sp = new SpawnPoint();
-            sp.Yaw = float.Parse(parts[0]);
-            sp.Pitch = float.Parse(parts[1]);
-            sp.Distance = float.Parse(parts[2]);
-            return sp;
-        }
-    }
-
     public class RegionSettings
     {
         public delegate void SaveDelegate(RegionSettings rs);
@@ -400,14 +331,6 @@ namespace OpenSim.Framework
             set { m_SunVector = value; }
         }
 
-        private UUID m_ParcelImageID;
-
-        public UUID ParcelImageID
-        {
-            get { return m_ParcelImageID; }
-            set { m_ParcelImageID = value; }
-        }
-
         private UUID m_TerrainImageID;
 
         public UUID TerrainImageID
@@ -440,14 +363,6 @@ namespace OpenSim.Framework
             set { m_Covenant = value; }
         }
 
-        private int m_CovenantChanged = 0;
-
-        public int CovenantChangedDateTime
-        {
-            get { return m_CovenantChanged; }
-            set { m_CovenantChanged = value; }
-        }
-
         private int m_LoadedCreationDateTime;
         public int LoadedCreationDateTime
         {
@@ -482,49 +397,5 @@ namespace OpenSim.Framework
             set { m_LoadedCreationID = value; }
         }
 
-        // Connected Telehub object
-        private UUID m_TelehubObject = UUID.Zero;
-        public UUID TelehubObject
-        {
-            get
-            {
-                return m_TelehubObject;
-            }
-            set
-            {
-                m_TelehubObject = value;
-            }
-        }
-
-        // Our Connected Telehub's SpawnPoints
-        public List<SpawnPoint> l_SpawnPoints = new List<SpawnPoint>();
-
-        // Add a SpawnPoint
-        // ** These are not region coordinates **
-        // They are relative to the Telehub coordinates
-        //
-        public void AddSpawnPoint(SpawnPoint point)
-        {
-            l_SpawnPoints.Add(point);
-        }
-
-        // Remove a SpawnPoint
-        public void RemoveSpawnPoint(int point_index)
-        {
-            l_SpawnPoints.RemoveAt(point_index);
-        }
-
-        // Return the List of SpawnPoints
-        public List<SpawnPoint> SpawnPoints()
-        {
-            return l_SpawnPoints;
-
-        }
-
-        // Clear the SpawnPoints List of all entries
-        public void ClearSpawnPoints()
-        {
-            l_SpawnPoints.Clear();
-        }
     }
-}
+}

OpenSim/Framework/SLUtil.cs

@@ -27,9 +27,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Reflection;
-using System.Xml;
 using log4net;
 using OpenMetaverse;
 
@@ -38,189 +36,239 @@ namespace OpenSim.Framework
     public static class SLUtil
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
+        
         #region SL / file extension / content-type conversions
 
-        private class TypeMapping
-        {
-            private sbyte assetType;
-            private InventoryType inventoryType;
-            private string contentType;
-            private string contentType2;
-            private string extension;
-
-            public sbyte AssetTypeCode
-            {
-                get { return assetType; }
-            }
-
-            public object AssetType
-            {
-                get {
-                    if (Enum.IsDefined(typeof(OpenMetaverse.AssetType), assetType))
-                        return (OpenMetaverse.AssetType)assetType;
-                    else
-                        return OpenMetaverse.AssetType.Unknown;
-                }
-            }
-
-            public InventoryType InventoryType
-            {
-                get { return inventoryType; }
-            }
-
-            public string ContentType
-            {
-                get { return contentType; }
-            }
-
-            public string ContentType2
-            {
-                get { return contentType2; }
-            }
-
-            public string Extension
-            {
-                get { return extension; }
-            }
-
-            private TypeMapping(sbyte assetType, InventoryType inventoryType, string contentType, string contentType2, string extension)
-            {
-                this.assetType = assetType;
-                this.inventoryType = inventoryType;
-                this.contentType = contentType;
-                this.contentType2 = contentType2;
-                this.extension = extension;
-            }
-
-            public TypeMapping(AssetType assetType, InventoryType inventoryType, string contentType, string contentType2, string extension)
-                : this((sbyte)assetType, inventoryType, contentType, contentType2, extension)
-            {
-            }
-
-            public TypeMapping(AssetType assetType, InventoryType inventoryType, string contentType, string extension)
-                : this((sbyte)assetType, inventoryType, contentType, null, extension)
-            {
-            }
-        }
-
-        /// <summary>
-        /// Maps between AssetType, InventoryType and Content-Type.
-        /// Where more than one possibility exists, the first one takes precedence. E.g.:
-        ///   AssetType "AssetType.Texture" -> Content-Type "image-xj2c"
-        ///   Content-Type "image/x-j2c" -> InventoryType "InventoryType.Texture"
-        /// </summary>
-        private static TypeMapping[] MAPPINGS = new TypeMapping[] {
-            new TypeMapping(AssetType.Unknown, InventoryType.Unknown, "application/octet-stream", "bin"),
-            new TypeMapping(AssetType.Texture, InventoryType.Texture, "image/x-j2c", "image/jp2", "j2c"),
-            new TypeMapping(AssetType.Texture, InventoryType.Snapshot, "image/x-j2c", "image/jp2", "j2c"),
-            new TypeMapping(AssetType.TextureTGA, InventoryType.Texture, "image/tga", "tga"),
-            new TypeMapping(AssetType.ImageTGA, InventoryType.Texture, "image/tga", "tga"),
-            new TypeMapping(AssetType.ImageJPEG, InventoryType.Texture, "image/jpeg", "jpg"),
-            new TypeMapping(AssetType.Sound, InventoryType.Sound, "audio/ogg", "application/ogg", "ogg"),
-            new TypeMapping(AssetType.SoundWAV, InventoryType.Sound, "audio/x-wav", "wav"),
-            new TypeMapping(AssetType.CallingCard, InventoryType.CallingCard, "application/vnd.ll.callingcard", "application/x-metaverse-callingcard", "callingcard"),
-            new TypeMapping(AssetType.Landmark, InventoryType.Landmark, "application/vnd.ll.landmark", "application/x-metaverse-landmark", "landmark"),
-            new TypeMapping(AssetType.Clothing, InventoryType.Wearable, "application/vnd.ll.clothing", "application/x-metaverse-clothing", "clothing"),
-            new TypeMapping(AssetType.Object, InventoryType.Object, "application/vnd.ll.primitive", "application/x-metaverse-primitive", "primitive"),
-            new TypeMapping(AssetType.Object, InventoryType.Attachment, "application/vnd.ll.primitive", "application/x-metaverse-primitive", "primitive"),
-            new TypeMapping(AssetType.Notecard, InventoryType.Notecard, "application/vnd.ll.notecard", "application/x-metaverse-notecard", "notecard"),
-            new TypeMapping(AssetType.Folder, InventoryType.Folder, "application/vnd.ll.folder", "folder"),
-            new TypeMapping(AssetType.RootFolder, InventoryType.RootCategory, "application/vnd.ll.rootfolder", "rootfolder"),
-            new TypeMapping(AssetType.LSLText, InventoryType.LSL, "application/vnd.ll.lsltext", "application/x-metaverse-lsl", "lsl"),
-            new TypeMapping(AssetType.LSLBytecode, InventoryType.LSL, "application/vnd.ll.lslbyte", "application/x-metaverse-lso", "lso"),
-            new TypeMapping(AssetType.Bodypart, InventoryType.Wearable, "application/vnd.ll.bodypart", "application/x-metaverse-bodypart", "bodypart"),
-            new TypeMapping(AssetType.TrashFolder, InventoryType.Folder, "application/vnd.ll.trashfolder", "trashfolder"),
-            new TypeMapping(AssetType.SnapshotFolder, InventoryType.Folder, "application/vnd.ll.snapshotfolder", "snapshotfolder"),
-            new TypeMapping(AssetType.LostAndFoundFolder, InventoryType.Folder, "application/vnd.ll.lostandfoundfolder", "lostandfoundfolder"),
-            new TypeMapping(AssetType.Animation, InventoryType.Animation, "application/vnd.ll.animation", "application/x-metaverse-animation", "animation"),
-            new TypeMapping(AssetType.Gesture, InventoryType.Gesture, "application/vnd.ll.gesture", "application/x-metaverse-gesture", "gesture"),
-            new TypeMapping(AssetType.Simstate, InventoryType.Snapshot, "application/x-metaverse-simstate", "simstate"),
-            new TypeMapping(AssetType.FavoriteFolder, InventoryType.Unknown, "application/vnd.ll.favoritefolder", "favoritefolder"),
-            new TypeMapping(AssetType.Link, InventoryType.Unknown, "application/vnd.ll.link", "link"),
-            new TypeMapping(AssetType.LinkFolder, InventoryType.Unknown, "application/vnd.ll.linkfolder", "linkfolder"),
-            new TypeMapping(AssetType.CurrentOutfitFolder, InventoryType.Unknown, "application/vnd.ll.currentoutfitfolder", "currentoutfitfolder"),
-            new TypeMapping(AssetType.OutfitFolder, InventoryType.Unknown, "application/vnd.ll.outfitfolder", "outfitfolder"),
-            new TypeMapping(AssetType.MyOutfitsFolder, InventoryType.Unknown, "application/vnd.ll.myoutfitsfolder", "myoutfitsfolder"),
-            new TypeMapping(AssetType.Mesh, InventoryType.Mesh, "application/vnd.ll.mesh", "llm")
-        };
-
-        private static Dictionary<sbyte, string> asset2Content;
-        private static Dictionary<sbyte, string> asset2Extension;
-        private static Dictionary<InventoryType, string> inventory2Content;
-        private static Dictionary<string, sbyte> content2Asset;
-        private static Dictionary<string, InventoryType> content2Inventory;
-
-        static SLUtil()
-        {
-            asset2Content = new Dictionary<sbyte, string>();
-            asset2Extension = new Dictionary<sbyte, string>();
-            inventory2Content = new Dictionary<InventoryType, string>();
-            content2Asset = new Dictionary<string, sbyte>();
-            content2Inventory = new Dictionary<string, InventoryType>();
-            
-            foreach (TypeMapping mapping in MAPPINGS)
-            {
-                sbyte assetType = mapping.AssetTypeCode;
-                if (!asset2Content.ContainsKey(assetType))
-                    asset2Content.Add(assetType, mapping.ContentType);
-                if (!asset2Extension.ContainsKey(assetType))
-                    asset2Extension.Add(assetType, mapping.Extension);
-                if (!inventory2Content.ContainsKey(mapping.InventoryType))
-                    inventory2Content.Add(mapping.InventoryType, mapping.ContentType);
-                if (!content2Asset.ContainsKey(mapping.ContentType))
-                    content2Asset.Add(mapping.ContentType, assetType);
-                if (!content2Inventory.ContainsKey(mapping.ContentType))
-                    content2Inventory.Add(mapping.ContentType, mapping.InventoryType);
-
-                if (mapping.ContentType2 != null)
-                {
-                    if (!content2Asset.ContainsKey(mapping.ContentType2))
-                        content2Asset.Add(mapping.ContentType2, assetType);
-                    if (!content2Inventory.ContainsKey(mapping.ContentType2))
-                        content2Inventory.Add(mapping.ContentType2, mapping.InventoryType);
-                }
-            }
-        }
-        
         public static string SLAssetTypeToContentType(int assetType)
         {
-            string contentType;
-            if (!asset2Content.TryGetValue((sbyte)assetType, out contentType))
-                contentType = asset2Content[(sbyte)AssetType.Unknown];
-            return contentType;
+            switch ((AssetType)assetType)
+            {
+                case AssetType.Texture:
+                    return "image/x-j2c";
+                case AssetType.Sound:
+                    return "audio/ogg";
+                case AssetType.CallingCard:
+                    return "application/vnd.ll.callingcard";
+                case AssetType.Landmark:
+                    return "application/vnd.ll.landmark";
+                case AssetType.Clothing:
+                    return "application/vnd.ll.clothing";
+                case AssetType.Object:
+                    return "application/vnd.ll.primitive";
+                case AssetType.Notecard:
+                    return "application/vnd.ll.notecard";
+                case AssetType.Folder:
+                    return "application/vnd.ll.folder";
+                case AssetType.RootFolder:
+                    return "application/vnd.ll.rootfolder";
+                case AssetType.LSLText:
+                    return "application/vnd.ll.lsltext";
+                case AssetType.LSLBytecode:
+                    return "application/vnd.ll.lslbyte";
+                case AssetType.TextureTGA:
+                case AssetType.ImageTGA:
+                    return "image/tga";
+                case AssetType.Bodypart:
+                    return "application/vnd.ll.bodypart";
+                case AssetType.TrashFolder:
+                    return "application/vnd.ll.trashfolder";
+                case AssetType.SnapshotFolder:
+                    return "application/vnd.ll.snapshotfolder";
+                case AssetType.LostAndFoundFolder:
+                    return "application/vnd.ll.lostandfoundfolder";
+                case AssetType.SoundWAV:
+                    return "audio/x-wav";
+                case AssetType.ImageJPEG:
+                    return "image/jpeg";
+                case AssetType.Animation:
+                    return "application/vnd.ll.animation";
+                case AssetType.Gesture:
+                    return "application/vnd.ll.gesture";
+                case AssetType.Simstate:
+                    return "application/x-metaverse-simstate";
+                case AssetType.FavoriteFolder:
+                    return "application/vnd.ll.favoritefolder";
+                case AssetType.Link:
+                    return "application/vnd.ll.link";
+                case AssetType.LinkFolder:
+                    return "application/vnd.ll.linkfolder";
+                case AssetType.CurrentOutfitFolder:
+                    return "application/vnd.ll.currentoutfitfolder";
+                case AssetType.OutfitFolder:
+                    return "application/vnd.ll.outfitfolder";
+                case AssetType.MyOutfitsFolder:
+                    return "application/vnd.ll.myoutfitsfolder";
+                case AssetType.Unknown:
+                default:
+                    return "application/octet-stream";
+            }
         }
 
         public static string SLInvTypeToContentType(int invType)
         {
-            string contentType;
-            if (!inventory2Content.TryGetValue((InventoryType)invType, out contentType))
-                contentType = inventory2Content[InventoryType.Unknown];
-            return contentType;
+            switch ((InventoryType)invType)
+            {
+                case InventoryType.Animation:
+                    return "application/vnd.ll.animation";
+                case InventoryType.CallingCard:
+                    return "application/vnd.ll.callingcard";
+                case InventoryType.Folder:
+                    return "application/vnd.ll.folder";
+                case InventoryType.Gesture:
+                    return "application/vnd.ll.gesture";
+                case InventoryType.Landmark:
+                    return "application/vnd.ll.landmark";
+                case InventoryType.LSL:
+                    return "application/vnd.ll.lsltext";
+                case InventoryType.Notecard:
+                    return "application/vnd.ll.notecard";
+                case InventoryType.Attachment:
+                case InventoryType.Object:
+                    return "application/vnd.ll.primitive";
+                case InventoryType.Sound:
+                    return "audio/ogg";
+                case InventoryType.Snapshot:
+                case InventoryType.Texture:
+                    return "image/x-j2c";
+                case InventoryType.Wearable:
+                    return "application/vnd.ll.clothing";
+                default:
+                    return "application/octet-stream";
+            }
         }
 
         public static sbyte ContentTypeToSLAssetType(string contentType)
         {
-            sbyte assetType;
-            if (!content2Asset.TryGetValue(contentType, out assetType))
-                assetType = (sbyte)AssetType.Unknown;
-            return (sbyte)assetType;
+            switch (contentType)
+            {
+                case "image/x-j2c":
+                case "image/jp2":
+                    return (sbyte)AssetType.Texture;
+                case "application/ogg":
+                case "audio/ogg":
+                    return (sbyte)AssetType.Sound;
+                case "application/vnd.ll.callingcard":
+                case "application/x-metaverse-callingcard":
+                    return (sbyte)AssetType.CallingCard;
+                case "application/vnd.ll.landmark":
+                case "application/x-metaverse-landmark":
+                    return (sbyte)AssetType.Landmark;
+                case "application/vnd.ll.clothing":
+                case "application/x-metaverse-clothing":
+                    return (sbyte)AssetType.Clothing;
+                case "application/vnd.ll.primitive":
+                case "application/x-metaverse-primitive":
+                    return (sbyte)AssetType.Object;
+                case "application/vnd.ll.notecard":
+                case "application/x-metaverse-notecard":
+                    return (sbyte)AssetType.Notecard;
+                case "application/vnd.ll.folder":
+                    return (sbyte)AssetType.Folder;
+                case "application/vnd.ll.rootfolder":
+                    return (sbyte)AssetType.RootFolder;
+                case "application/vnd.ll.lsltext":
+                case "application/x-metaverse-lsl":
+                    return (sbyte)AssetType.LSLText;
+                case "application/vnd.ll.lslbyte":
+                case "application/x-metaverse-lso":
+                    return (sbyte)AssetType.LSLBytecode;
+                case "image/tga":
+                    // Note that AssetType.TextureTGA will be converted to AssetType.ImageTGA
+                    return (sbyte)AssetType.ImageTGA;
+                case "application/vnd.ll.bodypart":
+                case "application/x-metaverse-bodypart":
+                    return (sbyte)AssetType.Bodypart;
+                case "application/vnd.ll.trashfolder":
+                    return (sbyte)AssetType.TrashFolder;
+                case "application/vnd.ll.snapshotfolder":
+                    return (sbyte)AssetType.SnapshotFolder;
+                case "application/vnd.ll.lostandfoundfolder":
+                    return (sbyte)AssetType.LostAndFoundFolder;
+                case "audio/x-wav":
+                    return (sbyte)AssetType.SoundWAV;
+                case "image/jpeg":
+                    return (sbyte)AssetType.ImageJPEG;
+                case "application/vnd.ll.animation":
+                case "application/x-metaverse-animation":
+                    return (sbyte)AssetType.Animation;
+                case "application/vnd.ll.gesture":
+                case "application/x-metaverse-gesture":
+                    return (sbyte)AssetType.Gesture;
+                case "application/x-metaverse-simstate":
+                    return (sbyte)AssetType.Simstate;
+                case "application/vnd.ll.favoritefolder":
+                    return (sbyte)AssetType.FavoriteFolder;
+                case "application/vnd.ll.link":
+                    return (sbyte)AssetType.Link;
+                case "application/vnd.ll.linkfolder":
+                    return (sbyte)AssetType.LinkFolder;
+                case "application/vnd.ll.currentoutfitfolder":
+                    return (sbyte)AssetType.CurrentOutfitFolder;
+                case "application/vnd.ll.outfitfolder":
+                    return (sbyte)AssetType.OutfitFolder;
+                case "application/vnd.ll.myoutfitsfolder":
+                    return (sbyte)AssetType.MyOutfitsFolder;
+                case "application/octet-stream":
+                default:
+                    return (sbyte)AssetType.Unknown;
+            }
         }
 
         public static sbyte ContentTypeToSLInvType(string contentType)
         {
-            InventoryType invType;
-            if (!content2Inventory.TryGetValue(contentType, out invType))
-                invType = InventoryType.Unknown;
-            return (sbyte)invType;
-        }
-
-        public static string SLAssetTypeToExtension(int assetType)
-        {
-            string extension;
-            if (!asset2Extension.TryGetValue((sbyte)assetType, out extension))
-                extension = asset2Extension[(sbyte)AssetType.Unknown];
-            return extension;
+            switch (contentType)
+            {
+                case "image/x-j2c":
+                case "image/jp2":
+                case "image/tga":
+                case "image/jpeg":
+                    return (sbyte)InventoryType.Texture;
+                case "application/ogg":
+                case "audio/ogg":
+                case "audio/x-wav":
+                    return (sbyte)InventoryType.Sound;
+                case "application/vnd.ll.callingcard":
+                case "application/x-metaverse-callingcard":
+                    return (sbyte)InventoryType.CallingCard;
+                case "application/vnd.ll.landmark":
+                case "application/x-metaverse-landmark":
+                    return (sbyte)InventoryType.Landmark;
+                case "application/vnd.ll.clothing":
+                case "application/x-metaverse-clothing":
+                case "application/vnd.ll.bodypart":
+                case "application/x-metaverse-bodypart":
+                    return (sbyte)InventoryType.Wearable;
+                case "application/vnd.ll.primitive":
+                case "application/x-metaverse-primitive":
+                    return (sbyte)InventoryType.Object;
+                case "application/vnd.ll.notecard":
+                case "application/x-metaverse-notecard":
+                    return (sbyte)InventoryType.Notecard;
+                case "application/vnd.ll.folder":
+                    return (sbyte)InventoryType.Folder;
+                case "application/vnd.ll.rootfolder":
+                    return (sbyte)InventoryType.RootCategory;
+                case "application/vnd.ll.lsltext":
+                case "application/x-metaverse-lsl":
+                case "application/vnd.ll.lslbyte":
+                case "application/x-metaverse-lso":
+                    return (sbyte)InventoryType.LSL;
+                case "application/vnd.ll.trashfolder":
+                case "application/vnd.ll.snapshotfolder":
+                case "application/vnd.ll.lostandfoundfolder":
+                    return (sbyte)InventoryType.Folder;
+                case "application/vnd.ll.animation":
+                case "application/x-metaverse-animation":
+                    return (sbyte)InventoryType.Animation;
+                case "application/vnd.ll.gesture":
+                case "application/x-metaverse-gesture":
+                    return (sbyte)InventoryType.Gesture;
+                case "application/x-metaverse-simstate":
+                    return (sbyte)InventoryType.Snapshot;
+                case "application/octet-stream":
+                default:
+                    return (sbyte)InventoryType.Unknown;
+            }
         }
 
         #endregion SL / file extension / content-type conversions

OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs

@@ -24,13 +24,11 @@
  * (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.IO;
-using System.Reflection;
 using System.Xml;
-using log4net;
+
 using OpenMetaverse;
 using OpenSim.Services.Interfaces;
 
@@ -41,93 +39,18 @@ namespace OpenSim.Framework.Serialization.External
     /// </summary>
     public class ExternalRepresentationUtils
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        /// <summary>
-        /// Populate a node with data read from xml using a dictinoary of processors
-        /// </summary>
-        /// <param name="nodeToFill"></param>
-        /// <param name="processors">/param>
-        /// <param name="xtr"></param>
-        /// <returns>true on successful, false if there were any processing failures</returns>
-        public static bool ExecuteReadProcessors<NodeType>(
-            NodeType nodeToFill, Dictionary<string, Action<NodeType, XmlTextReader>> processors, XmlTextReader xtr)
-        {
-            return ExecuteReadProcessors(
-                nodeToFill,
-                processors,
-                xtr,
-                (o, name, e)
-                    => m_log.DebugFormat(
-                        "[ExternalRepresentationUtils]: Exception while parsing element {0}, continuing.  Exception {1}{2}",
-                        name, e.Message, e.StackTrace));
-        }
-
-        /// <summary>
-        /// Populate a node with data read from xml using a dictinoary of processors
-        /// </summary>
-        /// <param name="nodeToFill"></param>
-        /// <param name="processors"></param>
-        /// <param name="xtr"></param>
-        /// <param name="parseExceptionAction">
-        /// Action to take if there is a parsing problem.  This will usually just be to log the exception
-        /// </param>
-        /// <returns>true on successful, false if there were any processing failures</returns>
-        public static bool ExecuteReadProcessors<NodeType>(
-            NodeType nodeToFill,
-            Dictionary<string, Action<NodeType, XmlTextReader>> processors,
-            XmlTextReader xtr,
-            Action<NodeType, string, Exception> parseExceptionAction)
-        {
-            bool errors = false;
-
-            string nodeName = string.Empty;
-            while (xtr.NodeType != XmlNodeType.EndElement)
-            {
-                nodeName = xtr.Name;
-
-//                        m_log.DebugFormat("[ExternalRepresentationUtils]: Processing: {0}", nodeName);
-
-                Action<NodeType, XmlTextReader> p = null;
-                if (processors.TryGetValue(xtr.Name, out p))
-                {
-//                            m_log.DebugFormat("[ExternalRepresentationUtils]: Found {0} processor, nodeName);
-
-                    try
-                    {
-                        p(nodeToFill, xtr);
-                    }
-                    catch (Exception e)
-                    {
-                        errors = true;
-                        parseExceptionAction(nodeToFill, nodeName, e);
-
-                        if (xtr.NodeType == XmlNodeType.EndElement)
-                            xtr.Read();
-                    }
-                }
-                else
-                {
-                    // m_log.DebugFormat("[LandDataSerializer]: caught unknown element {0}", nodeName);
-                    xtr.ReadOuterXml(); // ignore
-                }
-            }
-
-            return errors;
-        }
-
         /// <summary>
         /// Takes a XML representation of a SceneObjectPart and returns another XML representation
         /// with creator data added to it.
         /// </summary>
         /// <param name="xml">The SceneObjectPart represented in XML2</param>
-        /// <param name="homeURL">The URL of the user agents service (home) for the creator</param>
+        /// <param name="profileURL">The URL of the profile service for the creator</param>
         /// <param name="userService">The service for retrieving user account information</param>
         /// <param name="scopeID">The scope of the user account information (Grid ID)</param>
         /// <returns>The SceneObjectPart represented in XML2</returns>
-        public static string RewriteSOP(string xml, string homeURL, IUserAccountService userService, UUID scopeID)
+        public static string RewriteSOP(string xml, string profileURL, IUserAccountService userService, UUID scopeID)
         {
-            if (xml == string.Empty || homeURL == string.Empty || userService == null)
+            if (xml == string.Empty || profileURL == string.Empty || userService == null)
                 return xml;
 
             XmlDocument doc = new XmlDocument();
@@ -147,7 +70,6 @@ namespace OpenSim.Framework.Serialization.External
                         UUID.TryParse(node.InnerText, out uuid);
                         creator = userService.GetUserAccount(scopeID, uuid);
                     }
-
                     if (node.Name == "CreatorData" && node.InnerText != null && node.InnerText != string.Empty)
                         hasCreatorData = true;
 
@@ -161,7 +83,7 @@ namespace OpenSim.Framework.Serialization.External
                 if (!hasCreatorData && creator != null)
                 {
                     XmlElement creatorData = doc.CreateElement("CreatorData");
-                    creatorData.InnerText = homeURL + ";" + creator.FirstName + " " + creator.LastName;
+                    creatorData.InnerText = profileURL + "/" + creator.PrincipalID + ";" + creator.FirstName + " " + creator.LastName;
                     sop.AppendChild(creatorData);
                 }
             }
@@ -171,6 +93,7 @@ namespace OpenSim.Framework.Serialization.External
                 doc.Save(wr);
                 return wr.ToString();
             }
+
         }
     }
-}
+}

OpenSim/Framework/Serialization/External/LandDataSerializer.cs

@@ -28,10 +28,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Reflection;
 using System.Text;
 using System.Xml;
-using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
 
@@ -42,118 +40,7 @@ namespace OpenSim.Framework.Serialization.External
     /// </summary>
     public class LandDataSerializer
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private static Dictionary<string, Action<LandData, XmlTextReader>> m_ldProcessors
-            = new Dictionary<string, Action<LandData, XmlTextReader>>();
-
-        private static Dictionary<string, Action<LandAccessEntry, XmlTextReader>> m_laeProcessors
-            = new Dictionary<string, Action<LandAccessEntry, XmlTextReader>>();
-
-        static LandDataSerializer()
-        {
-            // LandData processors
-            m_ldProcessors.Add(
-                "Area",             (ld, xtr) => ld.Area = Convert.ToInt32(xtr.ReadElementString("Area")));
-            m_ldProcessors.Add(
-                "AuctionID",        (ld, xtr) => ld.AuctionID = Convert.ToUInt32(xtr.ReadElementString("AuctionID")));
-            m_ldProcessors.Add(
-                "AuthBuyerID",      (ld, xtr) => ld.AuthBuyerID = UUID.Parse(xtr.ReadElementString("AuthBuyerID")));
-            m_ldProcessors.Add(
-                "Category",         (ld, xtr) => ld.Category = (ParcelCategory)Convert.ToSByte(xtr.ReadElementString("Category")));
-            m_ldProcessors.Add(
-                "ClaimDate",        (ld, xtr) => ld.ClaimDate = Convert.ToInt32(xtr.ReadElementString("ClaimDate")));
-            m_ldProcessors.Add(
-                "ClaimPrice",       (ld, xtr) => ld.ClaimPrice = Convert.ToInt32(xtr.ReadElementString("ClaimPrice")));
-            m_ldProcessors.Add(
-                "GlobalID",         (ld, xtr) => ld.GlobalID = UUID.Parse(xtr.ReadElementString("GlobalID")));
-            m_ldProcessors.Add(
-                "GroupID",          (ld, xtr) => ld.GroupID = UUID.Parse(xtr.ReadElementString("GroupID")));
-            m_ldProcessors.Add(
-                "IsGroupOwned",     (ld, xtr) => ld.IsGroupOwned = Convert.ToBoolean(xtr.ReadElementString("IsGroupOwned")));
-            m_ldProcessors.Add(
-                "Bitmap",           (ld, xtr) => ld.Bitmap = Convert.FromBase64String(xtr.ReadElementString("Bitmap")));
-            m_ldProcessors.Add(
-                "Description",      (ld, xtr) => ld.Description = xtr.ReadElementString("Description"));
-            m_ldProcessors.Add(
-                "Flags",            (ld, xtr) => ld.Flags = Convert.ToUInt32(xtr.ReadElementString("Flags")));
-            m_ldProcessors.Add(
-                "LandingType",      (ld, xtr) => ld.LandingType = Convert.ToByte(xtr.ReadElementString("LandingType")));
-            m_ldProcessors.Add(
-                "Name",             (ld, xtr) => ld.Name = xtr.ReadElementString("Name"));
-            m_ldProcessors.Add(
-                "Status",           (ld, xtr) => ld.Status = (ParcelStatus)Convert.ToSByte(xtr.ReadElementString("Status")));
-            m_ldProcessors.Add(
-                "LocalID",          (ld, xtr) => ld.LocalID = Convert.ToInt32(xtr.ReadElementString("LocalID")));
-            m_ldProcessors.Add(
-                "MediaAutoScale",   (ld, xtr) => ld.MediaAutoScale = Convert.ToByte(xtr.ReadElementString("MediaAutoScale")));
-            m_ldProcessors.Add(
-                "MediaID",          (ld, xtr) => ld.MediaID = UUID.Parse(xtr.ReadElementString("MediaID")));
-            m_ldProcessors.Add(
-                "MediaURL",         (ld, xtr) => ld.MediaURL = xtr.ReadElementString("MediaURL"));
-            m_ldProcessors.Add(
-                "MusicURL",         (ld, xtr) => ld.MusicURL = xtr.ReadElementString("MusicURL"));
-            m_ldProcessors.Add(
-                "OwnerID",          (ld, xtr) => ld.OwnerID  = UUID.Parse(xtr.ReadElementString("OwnerID")));
-
-            m_ldProcessors.Add(
-                "ParcelAccessList", ProcessParcelAccessList);
-
-            m_ldProcessors.Add(
-                "PassHours",        (ld, xtr) => ld.PassHours = Convert.ToSingle(xtr.ReadElementString("PassHours")));
-            m_ldProcessors.Add(
-                "PassPrice",        (ld, xtr) => ld.PassPrice = Convert.ToInt32(xtr.ReadElementString("PassPrice")));
-            m_ldProcessors.Add(
-                "SalePrice",        (ld, xtr) => ld.SalePrice = Convert.ToInt32(xtr.ReadElementString("SalePrice")));
-            m_ldProcessors.Add(
-                "SnapshotID",       (ld, xtr) => ld.SnapshotID = UUID.Parse(xtr.ReadElementString("SnapshotID")));
-            m_ldProcessors.Add(
-                "UserLocation",     (ld, xtr) => ld.UserLocation = Vector3.Parse(xtr.ReadElementString("UserLocation")));
-            m_ldProcessors.Add(
-                "UserLookAt",       (ld, xtr) => ld.UserLookAt = Vector3.Parse(xtr.ReadElementString("UserLookAt")));
-
-            // No longer used here                                                                                                                  //
-            // m_ldProcessors.Add("Dwell",    (landData, xtr) => return);
-
-            m_ldProcessors.Add(
-                "OtherCleanTime",   (ld, xtr) => ld.OtherCleanTime = Convert.ToInt32(xtr.ReadElementString("OtherCleanTime")));
-
-            // LandAccessEntryProcessors
-            m_laeProcessors.Add(
-                "AgentID",          (lae, xtr) => lae.AgentID = UUID.Parse(xtr.ReadElementString("AgentID")));
-            m_laeProcessors.Add(
-                "Time",             (lae, xtr) =>
-                {
-                    // We really don't care about temp vs perm here and this
-                    // would break on old oars. Assume all bans are perm
-                    xtr.ReadElementString("Time");
-                    lae.Expires = 0; // Convert.ToUint(                       xtr.ReadElementString("Time"));
-                }
-            );
-            m_laeProcessors.Add(
-                "AccessList",       (lae, xtr) => lae.Flags = (AccessList)Convert.ToUInt32(xtr.ReadElementString("AccessList")));
-        }
-
-        public static void ProcessParcelAccessList(LandData ld, XmlTextReader xtr)
-        {
-            if (!xtr.IsEmptyElement)
-            {
-                while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement)
-                {
-                    LandAccessEntry lae = new LandAccessEntry();
-
-                    xtr.ReadStartElement("ParcelAccessEntry");
-
-                    ExternalRepresentationUtils.ExecuteReadProcessors<LandAccessEntry>(lae, m_laeProcessors, xtr);
-
-                    xtr.ReadEndElement();
-
-                    ld.ParcelAccessList.Add(lae);
-                }
-            }
-
-            xtr.Read();
-        }
+        protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding();
 
         /// <summary>
         /// Reify/deserialize landData
@@ -163,7 +50,7 @@ namespace OpenSim.Framework.Serialization.External
         /// <exception cref="System.Xml.XmlException"></exception>
         public static LandData Deserialize(byte[] serializedLandData)
         {
-            return Deserialize(Encoding.UTF8.GetString(serializedLandData, 0, serializedLandData.Length));
+            return Deserialize(m_utf8Encoding.GetString(serializedLandData, 0, serializedLandData.Length));
         }
 
         /// <summary>
@@ -176,28 +63,74 @@ namespace OpenSim.Framework.Serialization.External
         {
             LandData landData = new LandData();
 
-            using (XmlTextReader reader = new XmlTextReader(new StringReader(serializedLandData)))
+            StringReader sr = new StringReader(serializedLandData);
+            XmlTextReader xtr = new XmlTextReader(sr);
+
+            xtr.ReadStartElement("LandData");
+
+            landData.Area           = Convert.ToInt32(                 xtr.ReadElementString("Area"));
+            landData.AuctionID      = Convert.ToUInt32(                xtr.ReadElementString("AuctionID"));
+            landData.AuthBuyerID    = UUID.Parse(                      xtr.ReadElementString("AuthBuyerID"));
+            landData.Category       = (ParcelCategory)Convert.ToSByte( xtr.ReadElementString("Category"));
+            landData.ClaimDate      = Convert.ToInt32(                 xtr.ReadElementString("ClaimDate"));
+            landData.ClaimPrice     = Convert.ToInt32(                 xtr.ReadElementString("ClaimPrice"));
+            landData.GlobalID       = UUID.Parse(                      xtr.ReadElementString("GlobalID"));
+            landData.GroupID        = UUID.Parse(                      xtr.ReadElementString("GroupID"));
+            landData.IsGroupOwned   = Convert.ToBoolean(               xtr.ReadElementString("IsGroupOwned"));
+            landData.Bitmap         = Convert.FromBase64String(        xtr.ReadElementString("Bitmap"));
+            landData.Description    =                                  xtr.ReadElementString("Description");
+            landData.Flags          = Convert.ToUInt32(                xtr.ReadElementString("Flags"));
+            landData.LandingType    = Convert.ToByte(                  xtr.ReadElementString("LandingType"));
+            landData.Name           =                                  xtr.ReadElementString("Name");
+            landData.Status         = (ParcelStatus)Convert.ToSByte(   xtr.ReadElementString("Status"));
+            landData.LocalID        = Convert.ToInt32(                 xtr.ReadElementString("LocalID"));
+            landData.MediaAutoScale = Convert.ToByte(                  xtr.ReadElementString("MediaAutoScale"));
+            landData.MediaID        = UUID.Parse(                      xtr.ReadElementString("MediaID"));
+            landData.MediaURL       =                                  xtr.ReadElementString("MediaURL");
+            landData.MusicURL       =                                  xtr.ReadElementString("MusicURL");
+            landData.OwnerID        = UUID.Parse(                      xtr.ReadElementString("OwnerID"));
+
+            landData.ParcelAccessList = new List<ParcelManager.ParcelAccessEntry>();
+            xtr.Read();
+            if (xtr.Name != "ParcelAccessList")
+                throw new XmlException(String.Format("Expected \"ParcelAccessList\" element but got \"{0}\"", xtr.Name));
+
+            if (!xtr.IsEmptyElement)
             {
-                reader.ReadStartElement("LandData");
+                while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement)
+                {
+                    ParcelManager.ParcelAccessEntry pae = new ParcelManager.ParcelAccessEntry();
 
-                ExternalRepresentationUtils.ExecuteReadProcessors<LandData>(landData, m_ldProcessors, reader);
+                    xtr.ReadStartElement("ParcelAccessEntry");
+                    pae.AgentID    = UUID.Parse(                           xtr.ReadElementString("AgentID"));
+                    pae.Time       = Convert.ToDateTime(                   xtr.ReadElementString("Time"));
+                    pae.Flags      = (AccessList)Convert.ToUInt32(         xtr.ReadElementString("AccessList"));
+                    xtr.ReadEndElement();
 
-                reader.ReadEndElement();
+                    landData.ParcelAccessList.Add(pae);
+                }
             }
+            xtr.Read();
+
+            landData.PassHours      = Convert.ToSingle(                    xtr.ReadElementString("PassHours"));
+            landData.PassPrice      = Convert.ToInt32(                     xtr.ReadElementString("PassPrice"));
+            landData.SalePrice      = Convert.ToInt32(                     xtr.ReadElementString("SalePrice"));
+            landData.SnapshotID     = UUID.Parse(                          xtr.ReadElementString("SnapshotID"));
+            landData.UserLocation   = Vector3.Parse(                       xtr.ReadElementString("UserLocation"));
+            landData.UserLookAt     = Vector3.Parse(                       xtr.ReadElementString("UserLookAt"));
+            // No longer used here
+            xtr.ReadElementString("Dwell");
+            landData.OtherCleanTime = Convert.ToInt32(                     xtr.ReadElementString("OtherCleanTime"));
+
+            xtr.ReadEndElement();
+
+            xtr.Close();
+            sr.Close();
 
             return landData;
         }
 
-        /// <summary>
-        /// Serialize land data
-        /// </summary>
-        /// <param name='landData'></param>
-        /// <param name='options'>
-        /// Serialization options.
-        /// Can be null if there are no options.
-        /// "wipe-owners" will write UUID.Zero rather than the ownerID so that a later reload loads all parcels with the estate owner as the owner
-        /// </param>
-        public static string Serialize(LandData landData, Dictionary<string, object> options)
+        public static string Serialize(LandData landData)
         {
             StringWriter sw = new StringWriter();
             XmlTextWriter xtw = new XmlTextWriter(sw);
@@ -226,21 +159,14 @@ namespace OpenSim.Framework.Serialization.External
             xtw.WriteElementString("MediaID",        landData.MediaID.ToString());
             xtw.WriteElementString("MediaURL",       landData.MediaURL);
             xtw.WriteElementString("MusicURL",       landData.MusicURL);
-
-            UUID ownerIdToWrite;
-            if (options != null && options.ContainsKey("wipe-owners"))
-                ownerIdToWrite = UUID.Zero;                
-            else
-                ownerIdToWrite = landData.OwnerID;
-
-            xtw.WriteElementString("OwnerID",        ownerIdToWrite.ToString());
+            xtw.WriteElementString("OwnerID",        landData.OwnerID.ToString());
 
             xtw.WriteStartElement("ParcelAccessList");
-            foreach (LandAccessEntry pal in landData.ParcelAccessList)
+            foreach (ParcelManager.ParcelAccessEntry pal in landData.ParcelAccessList)
             {
                 xtw.WriteStartElement("ParcelAccessEntry");
                 xtw.WriteElementString("AgentID",     pal.AgentID.ToString());
-                xtw.WriteElementString("Time",        pal.Expires.ToString());
+                xtw.WriteElementString("Time",        pal.Time.ToString("s"));
                 xtw.WriteElementString("AccessList",  Convert.ToString((uint)pal.Flags));
                 xtw.WriteEndElement();
             }

OpenSim/Framework/Serialization/External/OspResolver.cs

@@ -65,14 +65,9 @@ namespace OpenSim.Framework.Serialization
 
             UserAccount account = userService.GetUserAccount(UUID.Zero, userId);
             if (account != null)
-            {
                 return MakeOspa(account.FirstName, account.LastName);
-            }
 //            else
-//            {
 //                m_log.WarnFormat("[OSP RESOLVER]: No user account for {0}", userId);
-//                System.Console.WriteLine("[OSP RESOLVER]: No user account for {0}", userId);
-//            }
 
             return null;
         }
@@ -84,13 +79,10 @@ namespace OpenSim.Framework.Serialization
         /// <returns></returns>
         public static string MakeOspa(string firstName, string lastName)
         {
-            string ospa
-                = OSPA_PREFIX + OSPA_NAME_KEY + OSPA_PAIR_SEPARATOR + firstName + OSPA_NAME_VALUE_SEPARATOR + lastName;
-
-//            m_log.DebugFormat("[OSP RESOLVER]: Made OSPA {0} for {1} {2}", ospa, firstName, lastName);
-//            System.Console.WriteLine("[OSP RESOLVER]: Made OSPA {0} for {1} {2}", ospa, firstName, lastName);
+//            m_log.DebugFormat("[OSP RESOLVER]: Making OSPA for {0} {1}", firstName, lastName);
             
-            return ospa;
+            return 
+                OSPA_PREFIX + OSPA_NAME_KEY + OSPA_PAIR_SEPARATOR + firstName + OSPA_NAME_VALUE_SEPARATOR + lastName;
         }
         
         /// <summary>

OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs

@@ -30,8 +30,6 @@ using System.Text;
 using System.Xml;
 using OpenMetaverse;
 using OpenSim.Framework;
-using log4net;
-using System.Reflection;
 
 namespace OpenSim.Framework.Serialization.External
 {
@@ -40,6 +38,8 @@ namespace OpenSim.Framework.Serialization.External
     /// </summary>
     public class RegionSettingsSerializer
     {
+        protected static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding();
+        
         /// <summary>
         /// Deserialize settings
         /// </summary>
@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Serialization.External
         /// <exception cref="System.Xml.XmlException"></exception>
         public static RegionSettings Deserialize(byte[] serializedSettings)
         {
-            return Deserialize(Encoding.ASCII.GetString(serializedSettings, 0, serializedSettings.Length));
+            return Deserialize(m_asciiEncoding.GetString(serializedSettings, 0, serializedSettings.Length));
         }
         
         /// <summary>
@@ -187,29 +187,7 @@ namespace OpenSim.Framework.Serialization.External
                         break;
                 }
             }
-
-            xtr.ReadEndElement();
-
-            if (xtr.IsStartElement("Telehub"))
-            {
-                xtr.ReadStartElement("Telehub");
-
-                while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement)
-                {
-                    switch (xtr.Name)
-                    {
-                        case "TelehubObject":
-                            settings.TelehubObject = UUID.Parse(xtr.ReadElementContentAsString());
-                            break;
-                        case "SpawnPoint":
-                            string str = xtr.ReadElementContentAsString();
-                            SpawnPoint sp = SpawnPoint.Parse(str);
-                            settings.AddSpawnPoint(sp);
-                            break;
-                    }
-                }
-            }
-
+            
             xtr.Close();
             sr.Close();
             
@@ -265,16 +243,7 @@ namespace OpenSim.Framework.Serialization.External
             xtw.WriteElementString("SunPosition", settings.SunPosition.ToString());
             // Note: 'SunVector' isn't saved because this value is owned by the Sun Module, which
             // calculates it automatically according to the date and other factors.
-            xtw.WriteEndElement();
-
-            xtw.WriteStartElement("Telehub");
-            if (settings.TelehubObject != UUID.Zero)
-            {
-                xtw.WriteElementString("TelehubObject", settings.TelehubObject.ToString());
-                foreach (SpawnPoint sp in settings.SpawnPoints())
-                    xtw.WriteElementString("SpawnPoint", sp.ToString());
-            }
-            xtw.WriteEndElement();
+            xtw.WriteEndElement(); 
             
             xtw.WriteEndElement();
             

OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs

@@ -41,13 +41,14 @@ namespace OpenSim.Framework.Serialization.External
 {        
     /// <summary>
     /// Serialize and deserialize user inventory items as an external format.
-    /// </summary>
+    /// </summary> 
+    /// XXX: Please do not use yet.
     public class UserInventoryItemSerializer
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private static Dictionary<string, Action<InventoryItemBase, XmlTextReader>> m_InventoryItemXmlProcessors
-            = new Dictionary<string, Action<InventoryItemBase, XmlTextReader>>();
+        private delegate void InventoryItemXmlProcessor(InventoryItemBase item, XmlTextReader reader);
+        private static Dictionary<string, InventoryItemXmlProcessor> m_InventoryItemXmlProcessors = new Dictionary<string, InventoryItemXmlProcessor>();
 
         #region InventoryItemBase Processor initialization 
         static UserInventoryItemSerializer()
@@ -204,14 +205,39 @@ namespace OpenSim.Framework.Serialization.External
             {
                 reader.ReadStartElement("InventoryItem");
 
-                ExternalRepresentationUtils.ExecuteReadProcessors<InventoryItemBase>(
-                    item, m_InventoryItemXmlProcessors, reader);
+                string nodeName = string.Empty;
+                while (reader.NodeType != XmlNodeType.EndElement)
+                {
+                    nodeName = reader.Name;
+                    InventoryItemXmlProcessor p = null;
+                    if (m_InventoryItemXmlProcessors.TryGetValue(reader.Name, out p))
+                    {
+                        //m_log.DebugFormat("[XXX] Processing: {0}", reader.Name);
+                        try
+                        {
+                            p(item, reader);
+                        }
+                        catch (Exception e)
+                        {
+                            m_log.DebugFormat("[InventoryItemSerializer]: exception while parsing {0}: {1}", nodeName, e);
+                            if (reader.NodeType == XmlNodeType.EndElement)
+                                reader.Read();
+                        }
+                    }
+                    else
+                    {
+                        // m_log.DebugFormat("[InventoryItemSerializer]: caught unknown element {0}", nodeName);
+                        reader.ReadOuterXml(); // ignore
+                    }
+
+                }
 
                 reader.ReadEndElement(); // InventoryItem
             }
 
             //m_log.DebugFormat("[XXX]: parsed InventoryItemBase {0} - {1}", obj.Name, obj.UUID);
             return item;
+
         }      
         
         public static string Serialize(InventoryItemBase inventoryItem, Dictionary<string, object> options, IUserAccountService userAccountService)
@@ -279,14 +305,14 @@ namespace OpenSim.Framework.Serialization.External
             writer.WriteEndElement();
             if (options.ContainsKey("creators") && inventoryItem.CreatorData != null && inventoryItem.CreatorData != string.Empty)
                 writer.WriteElementString("CreatorData", inventoryItem.CreatorData);
-            else if (options.ContainsKey("home"))
+            else if (options.ContainsKey("profile"))
             {
                 if (userAccountService != null)
                 {
                     UserAccount account = userAccountService.GetUserAccount(UUID.Zero, inventoryItem.CreatorIdAsUuid);
                     if (account != null)
                     {
-                        writer.WriteElementString("CreatorData", (string)options["home"] + "/" + inventoryItem.CreatorIdAsUuid + ";" + account.FirstName + " " + account.LastName);
+                        writer.WriteElementString("CreatorData", (string)options["profile"] + "/" + inventoryItem.CreatorIdAsUuid + ";" + account.FirstName + " " + account.LastName);
                     }
                     writer.WriteElementString("CreatorID", inventoryItem.CreatorId);
                 }