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

crossings

.nant/local.include

@@ -38,52 +38,8 @@
       <include name=".hgignore"/>
     </fileset>
   </delete>
-  
 </target>
 
-<!-- I don't think these targets are being actively used.  But just in case, we'll just comment them out for now - justincc -->
-<!--
-<property name="projectdir" value="opensim-0.6.9" />
-<target name="dist" depends="distdir">
-    <zip zipfile="${projectdir}.zip">
-    <fileset basedir=".">
-        <include name="${projectdir}/**" />
-    </fileset>
-    </zip>
-    <tar destfile="${projectdir}.tar.gz" compression="GZip">
-    <fileset basedir=".">
-        <include name="${projectdir}/**" />
-    </fileset>
-    </tar>
-</target>
-
-<target name="distdir">
-   <delete dir="${projectdir}" />
-   <copy todir="${projectdir}">
-       <fileset basedir=".">
-          <include name="ThirdPartyLicenses/**" />
-          <include name="CONTRIBUTORS.txt" />
-          <include name="README" />
-          <include name="OpenSim/**/*.cs" />
-          <include name="**/*.build" />
-          <include name="**/*.csproj" />
-          <include name="**/*.csproj.user" />
-          <include name="**/*.sln" />
-          <include name="bin/*.dll" />
-          <include name="bin/*.so" />
-          <include name="bin/*.config" />
-          <include name="bin/assets/**" />
-          <include name="bin/data/**" />
-          <include name="bin/OpenSim*xml" />
-          <include name="bin/OpenSim.ini" />
-          <include name="bin/defaultstripe.png" />
-          <exclude name="bin/OpenSim.*dll" />
-       </fileset>
-   </copy>
-   <touch file="${projectdir}/bin/startup_commands.txt" />
-</target>
--->
-
 <target name="test" depends="build, find-nunit">
   <setenv name="MONO_THREADS_PER_CPU" value="100" />
 
@@ -153,116 +109,17 @@
   <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> 
 
   <delete dir="%temp%"/>
-
 </target>
 
-<target name="test-cov" depends="build">
-    <!-- Code Coverage Test. Prototype, only works with mono 1.2. Instructions in http://opensimulator.org/wiki/Automated_Testing -->
-    <mkdir dir="cov" failonerror="false" />
-    <exec program="mono">
-      <arg value="--debug" />
-      <arg value="--profile=monocov:outfile=./cov/OpenSim.Framework.Servers.cov,+[OpenSim.Framework.Servers]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-      <arg value="./bin/OpenSim.Framework.Servers.Tests.dll" />
-    </exec>
-    <delete dir="./cov/OpenSim.Framework.Servers" />
-    <exec program="monocov">
-      <arg value="--export-html=./cov/OpenSim.Framework.Servers ./cov/OpenSim.Framework.Servers.cov" />
-    </exec>
+<target name="torture" depends="build, find-nunit">
+  <setenv name="MONO_THREADS_PER_CPU" value="100" />
 
-<!--
-    <exec program="mono">
-      <arg value="&#45;&#45;debug" />
-      <arg value="&#45;&#45;profile=monocov:outfile=./cov/OpenSim.Region.ClientStack.LindenUDP.cov,+[OpenSim.Region.ClientStack.LindenUDP]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-     <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
-    </exec>
-    <delete dir="./cov/OpenSim.Region.ClientStack.LindenUDP" />
-    <exec program="monocov">
-      <arg value="&#45;&#45;export-html=./cov/OpenSim.Region.ClientStack.LindenUDP ./cov/OpenSim.Region.ClientStack.LindenUDP.cov" />
-    </exec>
--->
-    
-    <exec program="mono">
-      <arg value="--debug" />
-      <arg value="--profile=monocov:outfile=./cov/OpenSim.Region.ScriptEngine.Shared.cov,+[OpenSim.Region.ScriptEngine.Shared]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-      <arg value="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
-    </exec>
-    <delete dir="./cov/OpenSim.Region.ScriptEngine.Shared" />
-    <exec program="monocov">      
-      <arg value="--export-html=./cov/OpenSim.Region.ScriptEngine.Shared ./cov/OpenSim.Region.ScriptEngine.Shared.cov" />
-    </exec>    
-    
-    <exec program="mono">
-      <arg value="--debug" />
-      <arg value="--profile=monocov:outfile=./cov/OpenSim.Region.ScriptEngine.Shared.CodeTools.cov,+[OpenSim.Region.ScriptEngine.Shared.CodeTools]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-      <arg value="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
-    </exec>
-    <delete dir="./cov/OpenSim.Region.ScriptEngine.Shared.CodeTools" />
-    <exec program="monocov">
-      <arg value="--export-html=./cov/OpenSim.Region.ScriptEngine.Shared.CodeTools ./cov/OpenSim.Region.ScriptEngine.Shared.CodeTools.cov" />
-    </exec>    
-    
-    <exec program="mono">
-      <arg value="--debug" />
-      <arg value="--profile=monocov:outfile=./cov/OpenSim.Region.CoreModules.cov,+[OpenSim.Region.CoreModules]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-      <arg value="./bin/OpenSim.Region.CoreModules.Tests.dll" />
-    </exec>
-    <delete dir="./cov/OpenSim.Region.CoreModules" />
-    <exec program="monocov">
-      <arg value="--export-html=./cov/OpenSim.Region.CoreModules ./cov/OpenSim.Region.CoreModules.cov" />
-    </exec>    
-    
-    <exec program="mono">
-      <arg value="--debug" />
-      <arg value="--profile=monocov:outfile=./cov/OpenSim.Region.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>    
-
-    <exec program="mono">
-      <arg value="--debug" />
-      <arg value="--profile=monocov:outfile=./cov/OpenSim.Region.Framework.cov,+[OpenSim.Region.Framework]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-      <arg value="./bin/OpenSim.Region.Framework.Tests.dll" />
-    </exec>
-    <delete dir="./cov/OpenSim.Region.Framework" />
-    <exec program="monocov">
-      <arg value="--export-html=./cov/OpenSim.Region.Framework ./cov/OpenSim.Region.Framework.cov" />
-    </exec>    
-    
-    <exec program="mono">
-      <arg value="--debug" />
-      <arg value="--profile=monocov:outfile=./cov/OpenSim.Data.SQLite.cov,+[OpenSim.Data.SQLite]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-      <arg value="./bin/OpenSim.Data.SQLite.Tests.dll" />
-    </exec>
-    <delete dir="./cov/OpenSim.Data.SQLite" />
-    <exec program="monocov">
-      <arg value="--export-html=./cov/OpenSim.Data.SQLite ./cov/OpenSim.Data.SQLite.cov" />
-    </exec>    
-    
-    <exec program="mono">
-      <arg value="--debug" />
-      <arg value="--profile=monocov:outfile=./cov/OpenSim.Data.MySQL.cov,+[OpenSim.Data.MySQL.Tests]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-      <arg value="./bin/OpenSim.Data.MySQL.Tests.dll" />
-    </exec>  
-    <delete dir="./cov/OpenSim.Data.MySQL" />
-    <exec program="monocov">
-      <arg value="--export-html=./cov/OpenSim.Data.MySQL ./cov/OpenSim.Data.MySQL.cov" />
-    </exec>     
-
-    <delete file="C:\NUnitPrimaryTrace.txt" failonerror="false" />
-    <delete file="TestResult.xml" failonerror="false" />
+  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.torture">
+    <arg value="./bin/OpenSim.Tests.Torture.dll" />
+  </exec>
 
+  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.torture)==0}" /> 
+  <delete dir="%temp%"/>
 </target>
 
 <target name="find-nunit">
@@ -275,15 +132,12 @@
     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">
@@ -356,36 +210,7 @@
  <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

@@ -17,13 +17,22 @@ Prereqs:
  * On some Linux distributions you may need to install additional packages.  
     See http://opensimulator.org/wiki/Dependencies for more information.
 
+ * May also use xbuild (included in mono distributions)
+ * May use Monodevelop, a cross-platform IDE 
+
 From the distribution type:
  * ./runprebuild.sh
- * nant
+ * nant (or xbuild)
  * cd bin 
  * copy OpenSim.ini.example to OpenSim.ini and other appropriate files in bin/config-include
  * run mono OpenSim.exe
 
+=== Using Monodevelop ===
+
+From the distribution type:
+ * ./runprebuild.sh
+ * type monodevelop OpenSim.sln
+
 === References ===
  
 Helpful resources:

CONTRIBUTORS.txt

@@ -80,6 +80,7 @@ what it is today.
 * dmiles (Daxtron Labs)
 * dslake (Intel)
 * FredoChaplin
+* Garmin Kawaguichi
 * Gerhard
 * Godfrey
 * Grumly57

OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs

@@ -258,17 +258,15 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             {
                 m_log.Info("[RADMIN]: Request to restart Region.");
 
-                CheckStringParameters(requestData, responseData, new string[] {"regionID"});
+                CheckRegionParams(requestData, responseData);
 
-                UUID regionID = new UUID((string) requestData["regionID"]);
+                Scene rebootedScene = null;
+                GetSceneFromRegionParams(requestData, responseData, out rebootedScene);
 
-                Scene rebootedScene;
+                IRestartModule restartModule = rebootedScene.RequestModuleInterface<IRestartModule>();
 
                 responseData["success"] = false;
                 responseData["accepted"] = true;
-                if (!m_application.SceneManager.TryGetScene(regionID, out rebootedScene))
-                    throw new Exception("region not found");
-
                 responseData["rebooting"] = true;
 
                 string message;
@@ -277,6 +275,23 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 if (requestData.ContainsKey("alerts"))
                 {
                     string[] alertTimes = requestData["alerts"].ToString().Split( new char[] {','});
+                    if (alertTimes.Length == 1 && Convert.ToInt32(alertTimes[0]) == -1)
+                    {
+                        if (restartModule != null)
+                        {
+                            message = "Restart has been cancelled";
+
+                            if (requestData.ContainsKey("message"))
+                                message = requestData["message"].ToString();
+
+                            restartModule.AbortRestart(message);
+
+                            responseData["success"] = true;
+                            responseData["rebooting"] = false;
+
+                            return;
+                        }
+                    }
                     foreach (string a in alertTimes)
                         times.Add(Convert.ToInt32(a));
                 }
@@ -309,7 +324,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     notice = false;
                 }
 
-                IRestartModule restartModule = rebootedScene.RequestModuleInterface<IRestartModule>();
                 if (restartModule != null)
                 {
                     restartModule.ScheduleRestart(UUID.Zero, message, times.ToArray(), notice);
@@ -392,14 +406,15 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             // }
 
             CheckStringParameters(requestData, responseData, new string[] {"filename", "regionid"});
+            CheckRegionParams(requestData, responseData);
 
-            string file = (string) requestData["filename"];
-            UUID regionID = (UUID) (string) requestData["regionid"];
-            m_log.InfoFormat("[RADMIN]: Terrain Loading: {0}", file);
+            Scene scene = null;
+            GetSceneFromRegionParams(requestData, responseData, out scene);
+            string file = (string)requestData["filename"];
 
             responseData["accepted"] = true;
 
-            LoadHeightmap(file, regionID);
+            LoadHeightmap(file, scene.RegionInfo.RegionID);
 
             responseData["success"] = true;
 
@@ -416,18 +431,16 @@ 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");
 
@@ -814,7 +827,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                 responseData["success"] = true;
                 responseData["region_name"] = region.RegionName;
-                responseData["region_uuid"] = region.RegionID.ToString();
+                responseData["region_id"] = region.RegionID.ToString();
+                responseData["region_uuid"] = region.RegionID.ToString(); //Deprecate July 2012
 
                 m_log.Info("[RADMIN]: CreateRegion: request complete");
             }
@@ -856,16 +870,16 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             lock (m_requestLock)
             {
                 CheckStringParameters(requestData, responseData, new string[] {"region_name"});
+                CheckRegionParams(requestData, responseData);
 
                 Scene scene = null;
-                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));
+                GetSceneFromRegionParams(requestData, responseData, out scene);
 
                 m_application.RemoveRegion(scene, true);
 
                 responseData["success"] = true;
-                responseData["region_name"] = regionName;
+                responseData["region_name"] = scene.RegionInfo.RegionName;
+                responseData["region_id"] = scene.RegionInfo.RegionID;
 
                 m_log.Info("[RADMIN]: DeleteRegion: request complete");
             }
@@ -905,44 +919,21 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
             Hashtable responseData = (Hashtable)response.Value;
             Hashtable requestData = (Hashtable)request.Params[0];
-            Scene scene = null;
 
             lock (m_requestLock)
             {
-                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));
+                CheckRegionParams(requestData, responseData);
 
-                    m_application.CloseRegion(scene);
+                Scene scene = null;
+                GetSceneFromRegionParams(requestData, responseData, out scene);
 
-                    responseData["success"] = true;
-                    responseData["region_id"] = regionID;
+                m_application.CloseRegion(scene);
 
-                    response.Value = responseData;
-                }
-                else if (
-                    requestData.ContainsKey("region_name")
-                         && !String.IsNullOrEmpty((string) requestData["region_name"]))
-                {
-                    // Region specified by name
+                responseData["success"] = true;
+                responseData["region_name"] = scene.RegionInfo.RegionName;
+                responseData["region_id"] = scene.RegionInfo.RegionID;
 
-                    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");
-                }
+                response.Value = responseData;
 
                 m_log.Info("[RADMIN]: CloseRegion: request complete");
             }
@@ -989,12 +980,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
             lock (m_requestLock)
             {
-                CheckStringParameters(requestData, responseData, new string[] {"region_name"});
+                CheckRegionParams(requestData, responseData);
 
                 Scene scene = null;
-                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));
+                GetSceneFromRegionParams(requestData, responseData, out scene);
 
                 // Modify access
                 scene.RegionInfo.EstateSettings.PublicAccess =
@@ -1024,7 +1013,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 }
 
                 responseData["success"] = true;
-                responseData["region_name"] = regionName;
+                responseData["region_name"] = scene.RegionInfo.RegionName;
+                responseData["region_id"] = scene.RegionInfo.RegionID;
 
                 m_log.Info("[RADMIN]: ModifyRegion: request complete");
             }
@@ -1420,22 +1410,12 @@ 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;
@@ -1516,22 +1496,12 @@ 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>();
 
@@ -1540,12 +1510,12 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 //    options["version"] = (string)requestData["version"];
                 //}
 
-                if (requestData.Contains("profile"))
+                if (requestData.Contains("home"))
                 {
-                    options["profile"] = (string)requestData["profile"];
+                    options["home"] = (string)requestData["home"];
                 }
 
-                if (requestData["noassets"].ToString() == "true")
+                if ((string)requestData["noassets"] == "true")
                 {
                     options["noassets"] = (string)requestData["noassets"] ;
                 }
@@ -1603,25 +1573,12 @@ 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;
 
@@ -1669,23 +1626,12 @@ 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;
 
@@ -1729,24 +1675,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
             responseData["success"] = true;
 
-            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()));
-            }
-            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));
-            }
-            else
-            {
-                throw new Exception("neither region_name nor region_uuid given");
-            }
+            CheckRegionParams(requestData, responseData);
 
-            Scene scene = m_application.SceneManager.CurrentScene;
+            Scene scene = null;
+            GetSceneFromRegionParams(requestData, responseData, out scene);
 
             int flags;
             string text;
@@ -1779,24 +1711,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
             responseData["success"] = true;
 
-            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));
+            CheckRegionParams(requestData, responseData);
 
-                m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_name);
-            }
-            else throw new Exception("neither region_name nor region_uuid given");
+            Scene scene = null;
+            GetSceneFromRegionParams(requestData, responseData, out scene);
 
-            Scene scene = m_application.SceneManager.CurrentScene;
             scene.RegionInfo.EstateSettings.EstateAccess = new UUID[]{};
 
             if (scene.RegionInfo.Persistent)
@@ -1812,32 +1731,17 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             Hashtable responseData = (Hashtable)response.Value;
             Hashtable requestData = (Hashtable)request.Params[0];
 
-            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");
-            }
+            CheckRegionParams(requestData, responseData);
+
+            Scene scene = null;
+            GetSceneFromRegionParams(requestData, responseData, out scene);
 
             int addedUsers = 0;
 
             if (requestData.Contains("users"))
             {
-                UUID scopeID = m_application.SceneManager.CurrentOrFirstScene.RegionInfo.ScopeID;
-                IUserAccountService userService = m_application.SceneManager.CurrentOrFirstScene.UserAccountService;
-                Scene scene = m_application.SceneManager.CurrentScene;
+                UUID scopeID = scene.RegionInfo.ScopeID;
+                IUserAccountService userService = scene.UserAccountService;
                 Hashtable users = (Hashtable) requestData["users"];
                 List<UUID> uuids = new List<UUID>();
                 foreach (string name in users.Values)
@@ -1876,32 +1780,18 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             Hashtable responseData = (Hashtable)response.Value;
             Hashtable requestData = (Hashtable)request.Params[0];
 
-            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));
-                m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_name);
-            }
-            else throw new Exception("neither region_name nor region_uuid given");
+            Scene scene = null;
+            GetSceneFromRegionParams(requestData, responseData, out scene);
 
             int removedUsers = 0;
 
             if (requestData.Contains("users"))
             {
-                UUID scopeID = m_application.SceneManager.CurrentOrFirstScene.RegionInfo.ScopeID;
-                IUserAccountService userService = m_application.SceneManager.CurrentOrFirstScene.UserAccountService;
+                UUID scopeID = scene.RegionInfo.ScopeID;
+                IUserAccountService userService = scene.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)
@@ -1928,6 +1818,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
 
             responseData["removed"] = removedUsers;
+            responseData["success"] = true;
 
             m_log.Info("[RADMIN]: Access List Remove Request complete");
         }
@@ -1939,32 +1830,18 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             Hashtable responseData = (Hashtable)response.Value;
             Hashtable requestData = (Hashtable)request.Params[0];
 
-            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));
-                m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_name);
-            }
-            else throw new Exception("neither region_name nor region_uuid given");
+            Scene scene = null;
+            GetSceneFromRegionParams(requestData, responseData, out scene);
 
-            Scene scene = m_application.SceneManager.CurrentScene;
             UUID[] accessControlList = scene.RegionInfo.EstateSettings.EstateAccess;
             Hashtable users = new Hashtable();
 
             foreach (UUID user in accessControlList)
             {
-                UUID scopeID = m_application.SceneManager.CurrentOrFirstScene.RegionInfo.ScopeID;
-                UserAccount account = m_application.SceneManager.CurrentOrFirstScene.UserAccountService.GetUserAccount(scopeID, user);
+                UUID scopeID = scene.RegionInfo.ScopeID;
+                UserAccount account = scene.UserAccountService.GetUserAccount(scopeID, user);
                 if (account != null)
                 {
                     users[user.ToString()] = account.FirstName + " " + account.LastName;
@@ -1972,6 +1849,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
 
             responseData["users"] = users;
+            responseData["success"] = true;
 
             m_log.Info("[RADMIN]: Access List List Request complete");
         }
@@ -2089,6 +1967,126 @@ 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/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs

@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+using OpenSim.Framework.Capabilities;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Services.Interfaces;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+using OSDArray = OpenMetaverse.StructuredData.OSDArray;
+using OSDMap = OpenMetaverse.StructuredData.OSDMap;
+
+namespace OpenSim.Capabilities.Handlers
+{
+    public class FetchInventory2Handler
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private IInventoryService m_inventoryService;
+
+        public FetchInventory2Handler(IInventoryService invService)
+        {
+            m_inventoryService = invService;
+        }
+
+        public string FetchInventoryRequest(string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        {
+//            m_log.DebugFormat("[FETCH INVENTORY HANDLER]: Received FetchInventory capabilty request");
+
+            OSDMap requestmap = (OSDMap)OSDParser.DeserializeLLSDXml(Utils.StringToBytes(request));
+            OSDArray itemsRequested = (OSDArray)requestmap["items"];
+
+            string reply;
+            LLSDFetchInventory llsdReply = new LLSDFetchInventory();
+
+            foreach (OSDMap osdItemId in itemsRequested)
+            {
+                UUID itemId = osdItemId["item_id"].AsUUID();
+
+                InventoryItemBase item = m_inventoryService.GetItem(new InventoryItemBase(itemId));
+
+                if (item != null)
+                {
+                    // We don't know the agent that this request belongs to so we'll use the agent id of the item
+                    // which will be the same for all items.
+                    llsdReply.agent_id = item.Owner;
+
+                    llsdReply.items.Array.Add(ConvertInventoryItem(item));
+                }
+            }
+
+            reply = LLSDHelpers.SerialiseLLSDReply(llsdReply);
+
+            return reply;
+        }
+
+        /// <summary>
+        /// Convert an internal inventory item object into an LLSD object.
+        /// </summary>
+        /// <param name="invItem"></param>
+        /// <returns></returns>
+        private LLSDInventoryItem ConvertInventoryItem(InventoryItemBase invItem)
+        {
+            LLSDInventoryItem llsdItem = new LLSDInventoryItem();
+            llsdItem.asset_id = invItem.AssetID;
+            llsdItem.created_at = invItem.CreationDate;
+            llsdItem.desc = invItem.Description;
+            llsdItem.flags = (int)invItem.Flags;
+            llsdItem.item_id = invItem.ID;
+            llsdItem.name = invItem.Name;
+            llsdItem.parent_id = invItem.Folder;
+
+            try
+            {
+                llsdItem.type = Utils.AssetTypeToString((AssetType)invItem.AssetType);
+                llsdItem.inv_type = Utils.InventoryTypeToString((InventoryType)invItem.InvType);
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat(
+                    "[WEB FETCH INV DESC HANDLER]: Problem setting asset {0} inventory {1} types while converting inventory item {2}: {3}",
+                    invItem.AssetType, invItem.InvType, invItem.Name, e.Message);
+            }
+
+            llsdItem.permissions = new LLSDPermissions();
+            llsdItem.permissions.creator_id = invItem.CreatorIdAsUuid;
+            llsdItem.permissions.base_mask = (int)invItem.CurrentPermissions;
+            llsdItem.permissions.everyone_mask = (int)invItem.EveryOnePermissions;
+            llsdItem.permissions.group_id = invItem.GroupID;
+            llsdItem.permissions.group_mask = (int)invItem.GroupPermissions;
+            llsdItem.permissions.is_owner_group = invItem.GroupOwned;
+            llsdItem.permissions.next_owner_mask = (int)invItem.NextPermissions;
+            llsdItem.permissions.owner_id = invItem.Owner;
+            llsdItem.permissions.owner_mask = (int)invItem.CurrentPermissions;
+            llsdItem.sale_info = new LLSDSaleInfo();
+            llsdItem.sale_info.sale_price = invItem.SalePrice;
+            switch (invItem.SaleType)
+            {
+                default:
+                    llsdItem.sale_info.sale_type = "not";
+                    break;
+                case 1:
+                    llsdItem.sale_info.sale_type = "original";
+                    break;
+                case 2:
+                    llsdItem.sale_info.sale_type = "copy";
+                    break;
+                case 3:
+                    llsdItem.sale_info.sale_type = "contents";
+                    break;
+            }
+
+            return llsdItem;
+        }
+    }
+}

OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2ServerConnector.cs

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using Nini.Config;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Server.Handlers.Base;
+using OpenMetaverse;
+
+namespace OpenSim.Capabilities.Handlers
+{
+    public class FetchInventory2ServerConnector : ServiceConnector
+    {
+        private IInventoryService m_InventoryService;
+        private string m_ConfigName = "CapsService";
+
+        public FetchInventory2ServerConnector(IConfigSource config, IHttpServer server, string configName)
+            : base(config, server, configName)
+        {
+            if (configName != String.Empty)
+                m_ConfigName = configName;
+
+            IConfig serverConfig = config.Configs[m_ConfigName];
+            if (serverConfig == null)
+                throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
+
+            string invService = serverConfig.GetString("InventoryService", String.Empty);
+
+            if (invService == String.Empty)
+                throw new Exception("No InventoryService in config file");
+
+            Object[] args = new Object[] { config };
+            m_InventoryService = ServerUtils.LoadPlugin<IInventoryService>(invService, args);
+
+            if (m_InventoryService == null)
+                throw new Exception(String.Format("Failed to load InventoryService from {0}; config is {1}", invService, m_ConfigName));
+
+            FetchInventory2Handler fiHandler = new FetchInventory2Handler(m_InventoryService);
+            IRequestHandler reqHandler
+                = new RestStreamHandler("POST", "/CAPS/FetchInventory/", fiHandler.FetchInventoryRequest);
+            server.AddStreamHandler(reqHandler);
+        }
+    }
+}

OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs

@@ -104,7 +104,7 @@ namespace OpenSim.Capabilities.Handlers
             }
             catch (Exception e)
             {
-                m_log.Error("[UPLOAD BAKED TEXTURE HANDLER]: " + e.ToString());
+                m_log.ErrorFormat("[UPLOAD BAKED TEXTURE HANDLER]: {0}{1}", e.Message, e.StackTrace);
             }
 
             return null;
@@ -117,7 +117,7 @@ namespace OpenSim.Capabilities.Handlers
         /// <param name="data"></param>
         private void BakedTextureUploaded(UUID assetID, byte[] data)
         {
-            //            m_log.WarnFormat("[CAPS]: Received baked texture {0}", assetID.ToString());
+//            m_log.DebugFormat("[UPLOAD BAKED TEXTURE HANDLER]: Received baked texture {0}", assetID.ToString());
 
             AssetBase asset;
             asset = new AssetBase(assetID, "Baked Texture", (sbyte)AssetType.Texture, m_HostCapsObj.AgentID.ToString());

OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs

@@ -240,78 +240,84 @@ namespace OpenSim.Capabilities.Handlers
 
                 if (containingFolder != null)
                 {
+//                    m_log.DebugFormat(
+//                        "[WEB FETCH INV DESC HANDLER]: Retrieved folder {0} {1} for agent id {2}",
+//                        containingFolder.Name, containingFolder.ID, agentID);
+
                     version = containingFolder.Version;
 
-                    if (fetchItems)
-                    {
-                        /*
-                        List<InventoryItemBase> linkedItemsToAdd = new List<InventoryItemBase>();
-
-                        foreach (InventoryItemBase item in contents.Items)
-                        {
-                            if (item.AssetType == (int)AssetType.Link)
-                            {
-                                InventoryItemBase linkedItem = m_InventoryService.GetItem(new InventoryItemBase(item.AssetID));
-
-                                // Take care of genuinely broken links where the target doesn't exist
-                                // HACK: Also, don't follow up links that just point to other links.  In theory this is legitimate,
-                                // but no viewer has been observed to set these up and this is the lazy way of avoiding cycles
-                                // rather than having to keep track of every folder requested in the recursion.
-                                if (linkedItem != null && linkedItem.AssetType != (int)AssetType.Link && linkedItem.AssetType == (int)AssetType.Object)
-                                    linkedItemsToAdd.Add(linkedItem);
-                            }
-                        }
-
-                        foreach (InventoryItemBase linkedItem in linkedItemsToAdd)
-                        {
-                            m_log.DebugFormat(
-                                "[WEB FETCH INV DESC HANDLER]: Inserted linked item {0} for link in folder {1} for agent {2}",
-                                linkedItem.Name, folderID, agentID);
-
-                            contents.Items.Insert(0, linkedItem);
-                        }
-                        */
-
-                        /*
-                        // If the folder requested contains links, then we need to send those folders first, otherwise the links
-                        // will be broken in the viewer.
-                        HashSet<UUID> linkedItemFolderIdsToSend = new HashSet<UUID>();
-                        foreach (InventoryItemBase item in contents.Items)
-                        {
-                            if (item.AssetType == (int)AssetType.Link)
-                            {
-                                InventoryItemBase linkedItem = m_InventoryService.GetItem(new InventoryItemBase(item.AssetID));
-
-                                // Take care of genuinely broken links where the target doesn't exist
-                                // HACK: Also, don't follow up links that just point to other links.  In theory this is legitimate,
-                                // but no viewer has been observed to set these up and this is the lazy way of avoiding cycles
-                                // rather than having to keep track of every folder requested in the recursion.
-                                if (linkedItem != null && linkedItem.AssetType != (int)AssetType.Link)
-                                {
-                                    // We don't need to send the folder if source and destination of the link are in the same
-                                    // folder.
-                                    if (linkedItem.Folder != containingFolder.ID)
-                                        linkedItemFolderIdsToSend.Add(linkedItem.Folder);
-                                }
-                            }
-                        }
-    
-                        foreach (UUID linkedItemFolderId in linkedItemFolderIdsToSend)
-                        {
-                            m_log.DebugFormat(
-                                "[WEB FETCH INV DESC HANDLER]: Recursively fetching folder {0} linked by item in folder {1} for agent {2}",
-                                linkedItemFolderId, folderID, agentID);
-
-                            int dummyVersion;
-                            InventoryCollection linkedCollection
-                                = Fetch(
-                                    agentID, linkedItemFolderId, ownerID, fetchFolders, fetchItems, sortOrder, out dummyVersion);
-
-                            contents.Folders.AddRange(linkedCollection.Folders);
-                            contents.Items.AddRange(linkedCollection.Items);
-                        }
-                        */
-                    }
+//                    if (fetchItems)
+//                    {
+//                        List<InventoryItemBase> linkedItemsToAdd = new List<InventoryItemBase>();
+//
+//                        foreach (InventoryItemBase item in contents.Items)
+//                        {
+//                            if (item.AssetType == (int)AssetType.Link)
+//                            {
+//                                InventoryItemBase linkedItem = m_InventoryService.GetItem(new InventoryItemBase(item.AssetID));
+//
+//                                // Take care of genuinely broken links where the target doesn't exist
+//                                // HACK: Also, don't follow up links that just point to other links.  In theory this is legitimate,
+//                                // but no viewer has been observed to set these up and this is the lazy way of avoiding cycles
+//                                // rather than having to keep track of every folder requested in the recursion.
+//                                if (linkedItem != null && linkedItem.AssetType != (int)AssetType.Link)
+//                                    linkedItemsToAdd.Insert(0, linkedItem);
+//                            }
+//                        }
+//
+//                        foreach (InventoryItemBase linkedItem in linkedItemsToAdd)
+//                        {
+//                            m_log.DebugFormat(
+//                                "[WEB FETCH INV DESC HANDLER]: Inserted linked item {0} for link in folder {1} for agent {2}",
+//                                linkedItem.Name, folderID, agentID);
+//
+//                            contents.Items.Add(linkedItem);
+//                        }
+//
+//                        // If the folder requested contains links, then we need to send those folders first, otherwise the links
+//                        // will be broken in the viewer.
+//                        HashSet<UUID> linkedItemFolderIdsToSend = new HashSet<UUID>();
+//                        foreach (InventoryItemBase item in contents.Items)
+//                        {
+//                            if (item.AssetType == (int)AssetType.Link)
+//                            {
+//                                InventoryItemBase linkedItem = m_InventoryService.GetItem(new InventoryItemBase(item.AssetID));
+//
+//                                // Take care of genuinely broken links where the target doesn't exist
+//                                // HACK: Also, don't follow up links that just point to other links.  In theory this is legitimate,
+//                                // but no viewer has been observed to set these up and this is the lazy way of avoiding cycles
+//                                // rather than having to keep track of every folder requested in the recursion.
+//                                if (linkedItem != null && linkedItem.AssetType != (int)AssetType.Link)
+//                                {
+//                                    // We don't need to send the folder if source and destination of the link are in the same
+//                                    // folder.
+//                                    if (linkedItem.Folder != containingFolder.ID)
+//                                        linkedItemFolderIdsToSend.Add(linkedItem.Folder);
+//                                }
+//                            }
+//                        }
+//    
+//                        foreach (UUID linkedItemFolderId in linkedItemFolderIdsToSend)
+//                        {
+//                            m_log.DebugFormat(
+//                                "[WEB FETCH INV DESC HANDLER]: Recursively fetching folder {0} linked by item in folder {1} for agent {2}",
+//                                linkedItemFolderId, folderID, agentID);
+//
+//                            int dummyVersion;
+//                            InventoryCollection linkedCollection
+//                                = Fetch(
+//                                    agentID, linkedItemFolderId, ownerID, fetchFolders, fetchItems, sortOrder, out dummyVersion);
+//
+//                            InventoryFolderBase linkedFolder = new InventoryFolderBase(linkedItemFolderId);
+//                            linkedFolder.Owner = agentID;
+//                            linkedFolder = m_InventoryService.GetFolder(linkedFolder);
+//
+////                            contents.Folders.AddRange(linkedCollection.Folders);
+//
+//                            contents.Folders.Add(linkedFolder);
+//                            contents.Items.AddRange(linkedCollection.Items);
+//                        }
+//                    }
                 }
             }
             else

OpenSim/Capabilities/LLSDInventoryItem.cs

@@ -95,4 +95,11 @@ namespace OpenSim.Framework.Capabilities
         public UUID owner_id; 
         public int version;
     }
-}
+
+    [OSDMap]
+    public class LLSDFetchInventory
+    {
+        public UUID agent_id;
+        public OSDArray items = new OSDArray();
+    }
+}

OpenSim/Data/MSSQL/MSSQLSimulationData.cs

@@ -681,7 +681,7 @@ VALUES
             using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
                 conn.Open();
-                foreach (ParcelManager.ParcelAccessEntry parcelAccessEntry in parcel.LandData.ParcelAccessList)
+                foreach (LandAccessEntry parcelAccessEntry in parcel.LandData.ParcelAccessList)
                 {
                     cmd.Parameters.AddRange(CreateLandAccessParameters(parcelAccessEntry, parcel.RegionUUID));
 
@@ -1252,7 +1252,7 @@ VALUES
 ,[elevation_1_ne] = @elevation_1_ne ,[elevation_2_ne] = @elevation_2_ne ,[elevation_1_se] = @elevation_1_se ,[elevation_2_se] = @elevation_2_se 
 ,[elevation_1_sw] = @elevation_1_sw ,[elevation_2_sw] = @elevation_2_sw ,[water_height] = @water_height ,[terrain_raise_limit] = @terrain_raise_limit 
 ,[terrain_lower_limit] = @terrain_lower_limit ,[use_estate_sun] = @use_estate_sun ,[fixed_sun] = @fixed_sun ,[sun_position] = @sun_position 
-,[covenant] = @covenant , [sunvectorx] = @sunvectorx, [sunvectory] = @sunvectory, [sunvectorz] = @sunvectorz,  [Sandbox] = @Sandbox, [loaded_creation_datetime] = @loaded_creation_datetime, [loaded_creation_id] = @loaded_creation_id
+,[covenant] = @covenant ,[covenant_datetime] = @covenant_datetime, [sunvectorx] = @sunvectorx, [sunvectory] = @sunvectory, [sunvectorz] = @sunvectorz,  [Sandbox] = @Sandbox, [loaded_creation_datetime] = @loaded_creation_datetime, [loaded_creation_id] = @loaded_creation_id
  WHERE [regionUUID] = @regionUUID";
 
                 using (SqlConnection conn = new SqlConnection(m_connectionString))
@@ -1307,14 +1307,14 @@ VALUES
                                 [block_show_in_search],[agent_limit],[object_bonus],[maturity],[disable_scripts],[disable_collisions],[disable_physics],
                                 [terrain_texture_1],[terrain_texture_2],[terrain_texture_3],[terrain_texture_4],[elevation_1_nw],[elevation_2_nw],[elevation_1_ne],
                                 [elevation_2_ne],[elevation_1_se],[elevation_2_se],[elevation_1_sw],[elevation_2_sw],[water_height],[terrain_raise_limit],
-                                [terrain_lower_limit],[use_estate_sun],[fixed_sun],[sun_position],[covenant],[sunvectorx], [sunvectory], [sunvectorz],[Sandbox], [loaded_creation_datetime], [loaded_creation_id]
+                                [terrain_lower_limit],[use_estate_sun],[fixed_sun],[sun_position],[covenant],[covenant_datetime],[sunvectorx], [sunvectory], [sunvectorz],[Sandbox], [loaded_creation_datetime], [loaded_creation_id]
  ) 
                             VALUES
                                 (@regionUUID,@block_terraform,@block_fly,@allow_damage,@restrict_pushing,@allow_land_resell,@allow_land_join_divide,
                                 @block_show_in_search,@agent_limit,@object_bonus,@maturity,@disable_scripts,@disable_collisions,@disable_physics,
                                 @terrain_texture_1,@terrain_texture_2,@terrain_texture_3,@terrain_texture_4,@elevation_1_nw,@elevation_2_nw,@elevation_1_ne,
                                 @elevation_2_ne,@elevation_1_se,@elevation_2_se,@elevation_1_sw,@elevation_2_sw,@water_height,@terrain_raise_limit,
-                                @terrain_lower_limit,@use_estate_sun,@fixed_sun,@sun_position,@covenant,@sunvectorx,@sunvectory, @sunvectorz, @Sandbox, @loaded_creation_datetime, @loaded_creation_id)";
+                                @terrain_lower_limit,@use_estate_sun,@fixed_sun,@sun_position,@covenant, @covenant_datetime, @sunvectorx,@sunvectory, @sunvectorz, @Sandbox, @loaded_creation_datetime, @loaded_creation_id)";
 
             using (SqlConnection conn = new SqlConnection(m_connectionString))
             using (SqlCommand cmd = new SqlCommand(sql, conn))
@@ -1376,7 +1376,7 @@ VALUES
                                                  Convert.ToSingle(row["sunvectorz"])
                                                  );
             newSettings.Covenant = new UUID((Guid)row["covenant"]);
-
+            newSettings.CovenantChangedDateTime = Convert.ToInt32(row["covenant_datetime"]);
             newSettings.LoadedCreationDateTime = Convert.ToInt32(row["loaded_creation_datetime"]);
 
             if (row["loaded_creation_id"] is DBNull)
@@ -1453,7 +1453,7 @@ VALUES
                 _Log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name);
             }
 
-            newData.ParcelAccessList = new List<ParcelManager.ParcelAccessEntry>();
+            newData.ParcelAccessList = new List<LandAccessEntry>();
 
             return newData;
         }
@@ -1463,12 +1463,12 @@ VALUES
         /// </summary>
         /// <param name="row">datarecord with landaccess data</param>
         /// <returns></returns>
-        private static ParcelManager.ParcelAccessEntry BuildLandAccessData(IDataRecord row)
+        private static LandAccessEntry BuildLandAccessData(IDataRecord row)
         {
-            ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
+            LandAccessEntry entry = new LandAccessEntry();
             entry.AgentID = new UUID((Guid)row["AccessUUID"]);
             entry.Flags = (AccessList)Convert.ToInt32(row["Flags"]);
-            entry.Time = new DateTime();
+            entry.Expires = 0;
             return entry;
         }
 
@@ -1789,6 +1789,7 @@ VALUES
             parameters.Add(_Database.CreateParameter("sunvectory", settings.SunVector.Y));
             parameters.Add(_Database.CreateParameter("sunvectorz", settings.SunVector.Z));
             parameters.Add(_Database.CreateParameter("covenant", settings.Covenant));
+            parameters.Add(_Database.CreateParameter("covenant_datetime", settings.CovenantChangedDateTime));
             parameters.Add(_Database.CreateParameter("Loaded_Creation_DateTime", settings.LoadedCreationDateTime));
             parameters.Add(_Database.CreateParameter("Loaded_Creation_ID", settings.LoadedCreationID));
 
@@ -1851,7 +1852,7 @@ VALUES
         /// <param name="parcelAccessEntry">parcel access entry.</param>
         /// <param name="parcelID">parcel ID.</param>
         /// <returns></returns>
-        private SqlParameter[] CreateLandAccessParameters(ParcelManager.ParcelAccessEntry parcelAccessEntry, UUID parcelID)
+        private SqlParameter[] CreateLandAccessParameters(LandAccessEntry parcelAccessEntry, UUID parcelID)
         {
             List<SqlParameter> parameters = new List<SqlParameter>();
 

OpenSim/Data/MSSQL/Resources/RegionStore.migrations

@@ -1043,3 +1043,11 @@ FOR CreatorID
 ALTER TABLE primitems ALTER COLUMN CreatorID uniqueidentifier NOT NULL
 
 COMMIT
+
+:VERSION 29         #---------------------
+
+BEGIN TRANSACTION
+
+ALTER TABLE regionsettings ADD covenant_datetime int NOT NULL default 0
+
+COMMIT

OpenSim/Data/MySQL/MySQLEstateData.cs

@@ -210,7 +210,6 @@ 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/MySQLGenericTableHandler.cs

@@ -173,6 +173,11 @@ namespace OpenSim.Data.MySQL
                                 int v = Convert.ToInt32(reader[name]);
                                 m_Fields[name].SetValue(row, v);
                             }
+                            else if (m_Fields[name].FieldType == typeof(uint))
+                            {
+                                uint v = Convert.ToUInt32(reader[name]);
+                                m_Fields[name].SetValue(row, v);
+                            }
                             else
                             {
                                 m_Fields[name].SetValue(row, reader[name]);
@@ -294,4 +299,4 @@ namespace OpenSim.Data.MySQL
             }
         }
     }
-}
+}

OpenSim/Data/MySQL/MySQLSimulationData.cs

@@ -561,45 +561,46 @@ namespace OpenSim.Data.MySQL
 
         public virtual void StoreTerrain(double[,] ter, UUID regionID)
         {
-            m_log.Info("[REGION DB]: Storing terrain");
-
-            lock (m_dbLock)
+            Util.FireAndForget(delegate(object x)
             {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+                double[,] oldTerrain = LoadTerrain(regionID);
+
+                m_log.Info("[REGION DB]: Storing terrain");
+
+                lock (m_dbLock)
                 {
-                    dbcon.Open();
-
-                    using (MySqlCommand cmd = dbcon.CreateCommand())
+                    using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                     {
-                        cmd.CommandText = "delete from terrain where RegionUUID = ?RegionUUID";
-                        cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
+                        dbcon.Open();
 
-                        using (MySqlCommand cmd2 = dbcon.CreateCommand())
+                        using (MySqlCommand cmd = dbcon.CreateCommand())
                         {
-                            try
-                            {
-                                cmd2.CommandText = "insert into terrain (RegionUUID, " +
-                                        "Revision, Heightfield) values (?RegionUUID, " +
-                                        "1, ?Heightfield)";
+                            cmd.CommandText = "delete from terrain where RegionUUID = ?RegionUUID";
+                            cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
 
-                                cmd2.Parameters.AddWithValue("RegionUUID", regionID.ToString());
-                                cmd2.Parameters.AddWithValue("Heightfield", SerializeTerrain(ter));
-
-                                ExecuteNonQuery(cmd);
-                                ExecuteNonQuery(cmd2);
-                            }
-                            catch
+                            using (MySqlCommand cmd2 = dbcon.CreateCommand())
                             {
-                                // If we get here there is a NaN in the terrain
-                                // and the terrain can't be saved. A crash here
-                                // is much better than losing all the work
-                                m_log.ErrorFormat("[DATA]: Unable to save terrain. Stopping simulator to prevent data loss");
-                                Environment.Exit(1);
+                                try
+                                {
+                                    cmd2.CommandText = "insert into terrain (RegionUUID, " +
+                                            "Revision, Heightfield) values (?RegionUUID, " +
+                                            "1, ?Heightfield)";
+
+                                    cmd2.Parameters.AddWithValue("RegionUUID", regionID.ToString());
+                                    cmd2.Parameters.AddWithValue("Heightfield", SerializeTerrain(ter, oldTerrain));
+
+                                    ExecuteNonQuery(cmd);
+                                    ExecuteNonQuery(cmd2);
+                                }
+                                catch (Exception e)
+                                {
+                                    m_log.ErrorFormat(e.ToString());
+                                }
                             }
                         }
                     }
                 }
-            }
+            });
         }
 
         public virtual double[,] LoadTerrain(UUID regionID)
@@ -714,10 +715,10 @@ namespace OpenSim.Data.MySQL
 
                         cmd.Parameters.Clear();
                         cmd.CommandText = "insert into landaccesslist (LandUUID, " +
-                                "AccessUUID, Flags) values (?LandUUID, ?AccessUUID, " +
-                                "?Flags)";
+                                "AccessUUID, Flags, Expires) values (?LandUUID, ?AccessUUID, " +
+                                "?Flags, ?Expires)";
 
-                        foreach (ParcelManager.ParcelAccessEntry entry in parcel.LandData.ParcelAccessList)
+                        foreach (LandAccessEntry entry in parcel.LandData.ParcelAccessList)
                         {
                             FillLandAccessCommand(cmd, entry, parcel.LandData.GlobalID);
                             ExecuteNonQuery(cmd);
@@ -860,6 +861,8 @@ namespace OpenSim.Data.MySQL
                 }
             }
 
+            LoadSpawnPoints(rs);
+
             return rs;
         }
 
@@ -1006,9 +1009,11 @@ namespace OpenSim.Data.MySQL
                             "elevation_2_sw, water_height, " +
                             "terrain_raise_limit, terrain_lower_limit, " +
                             "use_estate_sun, fixed_sun, sun_position, " +
-                            "covenant, Sandbox, sunvectorx, sunvectory, " +
+                            "covenant, covenant_datetime, Sandbox, sunvectorx, sunvectory, " +
                             "sunvectorz, loaded_creation_datetime, " +
-                            "loaded_creation_id, map_tile_ID, block_search, casino) values (?RegionUUID, ?BlockTerraform, " +
+                            "loaded_creation_id, map_tile_ID, block_search, casino, " +
+                            "TelehubObject, parcel_tile_ID) " +
+                             "values (?RegionUUID, ?BlockTerraform, " +
                             "?BlockFly, ?AllowDamage, ?RestrictPushing, " +
                             "?AllowLandResell, ?AllowLandJoinDivide, " +
                             "?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " +
@@ -1020,10 +1025,11 @@ namespace OpenSim.Data.MySQL
                             "?Elevation2SE, ?Elevation1SW, ?Elevation2SW, " +
                             "?WaterHeight, ?TerrainRaiseLimit, " +
                             "?TerrainLowerLimit, ?UseEstateSun, ?FixedSun, " +
-                            "?SunPosition, ?Covenant, ?Sandbox, " +
+                            "?SunPosition, ?Covenant, ?CovenantChangedDateTime, ?Sandbox, " +
                             "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
                             "?LoadedCreationDateTime, ?LoadedCreationID, " +
-                            "?TerrainImageID, ?block_search, ?casino)";
+                            "?TerrainImageID, ?block_search, ?casino, " +
+                            "?TelehubObject, ?ParcelImageID)";
 
                         FillRegionSettingsCommand(cmd, rs);
 
@@ -1031,6 +1037,7 @@ namespace OpenSim.Data.MySQL
                     }
                 }
             }
+            SaveSpawnPoints(rs);
         }
 
         public virtual List<LandData> LoadLandObjects(UUID regionUUID)
@@ -1301,7 +1308,7 @@ namespace OpenSim.Data.MySQL
             newSettings.FixedSun = Convert.ToBoolean(row["fixed_sun"]);
             newSettings.SunPosition = Convert.ToDouble(row["sun_position"]);
             newSettings.Covenant = DBGuid.FromDB(row["covenant"]);
-
+            newSettings.CovenantChangedDateTime = Convert.ToInt32(row["covenant_datetime"]);
             newSettings.LoadedCreationDateTime = Convert.ToInt32(row["loaded_creation_datetime"]);
             
             if (row["loaded_creation_id"] is DBNull)
@@ -1310,6 +1317,8 @@ namespace OpenSim.Data.MySQL
                 newSettings.LoadedCreationID = (String) row["loaded_creation_id"];
 
             newSettings.TerrainImageID = DBGuid.FromDB(row["map_tile_ID"]);
+            newSettings.ParcelImageID = DBGuid.FromDB(row["parcel_tile_ID"]);
+            newSettings.TelehubObject = DBGuid.FromDB(row["TelehubObject"]);
 
             newSettings.GodBlockSearch = Convert.ToBoolean(row["block_search"]);
             newSettings.Casino = Convert.ToBoolean(row["casino"]);
@@ -1387,7 +1396,7 @@ namespace OpenSim.Data.MySQL
             newData.ObscureMusic = Convert.ToBoolean(row["ObscureMusic"]);
             newData.ObscureMedia = Convert.ToBoolean(row["ObscureMedia"]);
 
-            newData.ParcelAccessList = new List<ParcelManager.ParcelAccessEntry>();
+            newData.ParcelAccessList = new List<LandAccessEntry>();
 
             return newData;
         }
@@ -1397,12 +1406,12 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="row"></param>
         /// <returns></returns>
-        private static ParcelManager.ParcelAccessEntry BuildLandAccessData(IDataReader row)
+        private static LandAccessEntry BuildLandAccessData(IDataReader row)
         {
-            ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
+            LandAccessEntry entry = new LandAccessEntry();
             entry.AgentID = DBGuid.FromDB(row["AccessUUID"]);
             entry.Flags = (AccessList) Convert.ToInt32(row["Flags"]);
-            entry.Time = new DateTime();
+            entry.Expires = Convert.ToInt32(row["Expires"]);
             return entry;
         }
 
@@ -1411,7 +1420,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="val"></param>
         /// <returns></returns>
-        private static Array SerializeTerrain(double[,] val)
+        private static Array SerializeTerrain(double[,] val, double[,] oldTerrain)
         {
             MemoryStream str = new MemoryStream(((int)Constants.RegionSize * (int)Constants.RegionSize) *sizeof (double));
             BinaryWriter bw = new BinaryWriter(str);
@@ -1420,7 +1429,11 @@ namespace OpenSim.Data.MySQL
             for (int x = 0; x < (int)Constants.RegionSize; x++)
                 for (int y = 0; y < (int)Constants.RegionSize; y++)
                 {
-                    double height = val[x, y];
+                    double height = 20.0;
+                    if (oldTerrain != null)
+                        height = oldTerrain[x, y];
+                    if (!double.IsNaN(val[x, y]))
+                        height = val[x, y];
                     if (height == 0.0)
                         height = double.Epsilon;
 
@@ -1640,12 +1653,15 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("FixedSun", settings.FixedSun);
             cmd.Parameters.AddWithValue("SunPosition", settings.SunPosition);
             cmd.Parameters.AddWithValue("Covenant", settings.Covenant.ToString());
+            cmd.Parameters.AddWithValue("CovenantChangedDateTime", settings.CovenantChangedDateTime);
             cmd.Parameters.AddWithValue("LoadedCreationDateTime", settings.LoadedCreationDateTime);
             cmd.Parameters.AddWithValue("LoadedCreationID", settings.LoadedCreationID);
             cmd.Parameters.AddWithValue("TerrainImageID", settings.TerrainImageID);
             cmd.Parameters.AddWithValue("block_search", settings.GodBlockSearch);
             cmd.Parameters.AddWithValue("casino", settings.Casino);
 
+            cmd.Parameters.AddWithValue("ParcelImageID", settings.ParcelImageID);
+            cmd.Parameters.AddWithValue("TelehubObject", settings.TelehubObject);
         }
 
         /// <summary>
@@ -1708,11 +1724,12 @@ namespace OpenSim.Data.MySQL
         /// <param name="row"></param>
         /// <param name="entry"></param>
         /// <param name="parcelID"></param>
-        private static void FillLandAccessCommand(MySqlCommand cmd, ParcelManager.ParcelAccessEntry entry, UUID parcelID)
+        private static void FillLandAccessCommand(MySqlCommand cmd, LandAccessEntry entry, UUID parcelID)
         {
             cmd.Parameters.AddWithValue("LandUUID", parcelID.ToString());
             cmd.Parameters.AddWithValue("AccessUUID", entry.AgentID.ToString());
             cmd.Parameters.AddWithValue("Flags", entry.Flags);
+            cmd.Parameters.AddWithValue("Expires", entry.Expires.ToString());
         }
 
         /// <summary>
@@ -1847,5 +1864,72 @@ namespace OpenSim.Data.MySQL
                 }
             }
         }
+
+        private void LoadSpawnPoints(RegionSettings rs)
+        {
+            rs.ClearSpawnPoints();
+
+            lock (m_dbLock)
+            {
+                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+                {
+                    dbcon.Open();
+
+                    using (MySqlCommand cmd = dbcon.CreateCommand())
+                    {
+                        cmd.CommandText = "select Yaw, Pitch, Distance from spawn_points where RegionID = ?RegionID";
+                        cmd.Parameters.AddWithValue("?RegionID", rs.RegionUUID.ToString());
+
+                        using (IDataReader r = cmd.ExecuteReader())
+                        {
+                            while (r.Read())
+                            {
+                                SpawnPoint sp = new SpawnPoint();
+
+                                sp.Yaw = (float)r["Yaw"];
+                                sp.Pitch = (float)r["Pitch"];
+                                sp.Distance = (float)r["Distance"];
+
+                                rs.AddSpawnPoint(sp);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        private void SaveSpawnPoints(RegionSettings rs)
+        {
+            lock (m_dbLock)
+            {
+                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+                {
+                    dbcon.Open();
+
+                    using (MySqlCommand cmd = dbcon.CreateCommand())
+                    {
+                        cmd.CommandText = "delete from spawn_points where RegionID = ?RegionID";
+                        cmd.Parameters.AddWithValue("?RegionID", rs.RegionUUID.ToString());
+
+                        cmd.ExecuteNonQuery();
+
+                        cmd.Parameters.Clear();
+
+                        cmd.CommandText = "insert into spawn_points (RegionID, Yaw, Pitch, Distance) values ( ?RegionID, ?Yaw, ?Pitch, ?Distance)";
+
+                        foreach (SpawnPoint p in rs.SpawnPoints())
+                        {
+                            cmd.Parameters.AddWithValue("?RegionID", rs.RegionUUID.ToString());
+                            cmd.Parameters.AddWithValue("?Yaw", p.Yaw);
+                            cmd.Parameters.AddWithValue("?Pitch", p.Pitch);
+                            cmd.Parameters.AddWithValue("?Distance", p.Distance);
+
+                            cmd.ExecuteNonQuery();
+                            cmd.Parameters.Clear();
+                        }
+                    }
+                }
+            }
+        }
     }
 }

OpenSim/Data/MySQL/Resources/GridStore.migrations

@@ -94,3 +94,12 @@ 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,4 +841,45 @@ alter table regionban ENGINE = MyISAM;
 alter table regionsettings ENGINE = MyISAM;
 alter table terrain ENGINE = MyISAM;
 
-COMMIT;
+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;
+

OpenSim/Data/SQLite/Resources/RegionStore.migrations

@@ -466,4 +466,9 @@ 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;
+COMMIT;
+
+:VERSION 22
+BEGIN;
+ALTER TABLE regionsettings ADD COLUMN covenant_datetime INTEGER NOT NULL default 0;
+COMMIT;

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, cmd.Connection);
+            ExecuteNonQuery(cmd, m_Connection);
 
             return true;
         }

OpenSim/Data/SQLite/SQLiteSimulationData.cs

@@ -759,7 +759,7 @@ namespace OpenSim.Data.SQLite
                     landaccesslist.Rows.Remove(rowsToDelete[iter]);
                 }
                 rowsToDelete.Clear();
-                foreach (ParcelManager.ParcelAccessEntry entry in parcel.LandData.ParcelAccessList)
+                foreach (LandAccessEntry entry in parcel.LandData.ParcelAccessList)
                 {
                     DataRow newAccessRow = landaccesslist.NewRow();
                     fillLandAccessRow(newAccessRow, entry, parcel.LandData.GlobalID);
@@ -1185,6 +1185,7 @@ namespace OpenSim.Data.SQLite
             createCol(regionsettings, "fixed_sun", typeof (Int32));
             createCol(regionsettings, "sun_position", typeof (Double));
             createCol(regionsettings, "covenant", typeof(String));
+            createCol(regionsettings, "covenant_datetime", typeof(Int32));
             createCol(regionsettings, "map_tile_ID", typeof(String));
             regionsettings.PrimaryKey = new DataColumn[] { regionsettings.Columns["regionUUID"] };
             return regionsettings;
@@ -1456,7 +1457,7 @@ namespace OpenSim.Data.SQLite
                 newData.UserLocation = Vector3.Zero;
                 newData.UserLookAt = Vector3.Zero;
             }
-            newData.ParcelAccessList = new List<ParcelManager.ParcelAccessEntry>();
+            newData.ParcelAccessList = new List<LandAccessEntry>();
             UUID authBuyerID = UUID.Zero;
 
             UUID.TryParse((string)row["AuthbuyerID"], out authBuyerID);
@@ -1509,6 +1510,7 @@ namespace OpenSim.Data.SQLite
             newSettings.FixedSun = Convert.ToBoolean(row["fixed_sun"]);
             newSettings.SunPosition = Convert.ToDouble(row["sun_position"]);
             newSettings.Covenant = new UUID((String) row["covenant"]);
+            newSettings.CovenantChangedDateTime = Convert.ToInt32(row["covenant_datetime"]);
             newSettings.TerrainImageID = new UUID((String)row["map_tile_ID"]);
 
             return newSettings;
@@ -1519,12 +1521,12 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="row"></param>
         /// <returns></returns>
-        private static ParcelManager.ParcelAccessEntry buildLandAccessData(DataRow row)
+        private static LandAccessEntry buildLandAccessData(DataRow row)
         {
-            ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
+            LandAccessEntry entry = new LandAccessEntry();
             entry.AgentID = new UUID((string) row["AccessUUID"]);
             entry.Flags = (AccessList) row["Flags"];
-            entry.Time = new DateTime();
+            entry.Expires = 0;
             return entry;
         }
 
@@ -1787,7 +1789,7 @@ namespace OpenSim.Data.SQLite
         /// <param name="row"></param>
         /// <param name="entry"></param>
         /// <param name="parcelID"></param>
-        private static void fillLandAccessRow(DataRow row, ParcelManager.ParcelAccessEntry entry, UUID parcelID)
+        private static void fillLandAccessRow(DataRow row, LandAccessEntry entry, UUID parcelID)
         {
             row["LandUUID"] = parcelID.ToString();
             row["AccessUUID"] = entry.AgentID.ToString();
@@ -1833,6 +1835,7 @@ namespace OpenSim.Data.SQLite
             row["fixed_sun"] = settings.FixedSun;
             row["sun_position"] = settings.SunPosition;
             row["covenant"] = settings.Covenant.ToString();
+            row["covenant_datetime"] = settings.CovenantChangedDateTime;
             row["map_tile_ID"] = settings.TerrainImageID.ToString();
         }
 

OpenSim/Data/Tests/RegionTests.cs

@@ -685,7 +685,7 @@ namespace OpenSim.Data.Tests
             SceneObjectGroup sog = GetMySOG("object1");
             InventoryItemBase i = NewItem(item1, zero, zero, itemname1, zero);
 
-            Assert.That(sog.AddInventoryItem(null, sog.RootPart.LocalId, i, zero), Is.True);
+            Assert.That(sog.AddInventoryItem(zero, 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))");
             
@@ -762,7 +762,7 @@ namespace OpenSim.Data.Tests
             i.CreationDate = creationd;
             
             SceneObjectGroup sog = GetMySOG("object1");
-            Assert.That(sog.AddInventoryItem(null, sog.RootPart.LocalId, i, zero), Is.True);
+            Assert.That(sog.AddInventoryItem(zero, 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))");
@@ -807,10 +807,10 @@ namespace OpenSim.Data.Tests
             
             SceneObjectGroup sog = FindSOG("object1", region1);
 
-            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);
+            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);
             
             TaskInventoryItem t1 = sog.GetInventoryItem(sog.RootPart.LocalId, i1);
             Assert.That(t1.Name, Is.EqualTo(ib1.Name), "Assert.That(t1.Name, Is.EqualTo(ib1.Name))");

OpenSim/Framework/AgentCircuitData.cs

@@ -296,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/AvatarAppearance.cs

@@ -264,10 +264,12 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Set up appearance textures.
-        /// Returns boolean that indicates whether the new entries actually change the
-        /// existing values.
+        /// Set up appearance texture ids.
         /// </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)
@@ -284,25 +286,30 @@ 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)

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/Console/CommandConsole.cs

@@ -31,6 +31,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Reflection;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
 using log4net;
 using OpenSim.Framework;
@@ -531,6 +532,11 @@ 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>();
@@ -544,10 +550,38 @@ 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

OpenSim/Framework/EstateSettings.cs

@@ -425,5 +425,11 @@ namespace OpenSim.Framework
             AllowParcelChanges = ((regionFlags & (ulong)RegionFlags.AllowParcelChanges) == (ulong)RegionFlags.AllowParcelChanges);
             AllowSetHome = ((regionFlags & (ulong)RegionFlags.AllowSetHome) == (ulong)RegionFlags.AllowSetHome);
         }
+
+        public bool GroupAccess(UUID groupID)
+        {
+            return l_EstateGroups.Contains(groupID);
+        }
+
     }
 }

OpenSim/Framework/IClientAPI.cs

@@ -177,7 +177,7 @@ namespace OpenSim.Framework
 
     public delegate void ParcelAccessListUpdateRequest(UUID agentID, uint flags,
                     int landLocalID, UUID transactionID, int sequenceID,
-                    int sections, List<ParcelManager.ParcelAccessEntry> entries,
+                    int sections, List<LandAccessEntry> entries,
                     IClientAPI remote_client);
 
     public delegate void ParcelPropertiesRequest(
@@ -361,6 +361,8 @@ 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);
@@ -774,6 +776,7 @@ 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?")]
@@ -1082,7 +1085,15 @@ 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>
@@ -1141,6 +1152,8 @@ 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>
@@ -1230,7 +1243,7 @@ namespace OpenSim.Framework
         void SendEstateCovenantInformation(UUID covenant);
 
         void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags,
-                                    uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner);
+                                    uint sunPosition, UUID covenant, uint covenantChanged, string abuseEmail, UUID estateOwner);
 
         /// <summary>
         /// Send land properties to the client.
@@ -1246,7 +1259,7 @@ namespace OpenSim.Framework
                                 float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity,
                                 uint regionFlags);
 
-        void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID);
+        void SendLandAccessListData(List<LandAccessEntry> accessList, uint accessFlag, int localLandID);
         void SendForceClientSelectObjects(List<uint> objectIDs);
         void SendCameraConstraint(Vector4 ConstraintPlane);
         void SendLandObjectOwners(LandData land, List<UUID> groups, Dictionary<UUID, int> ownersAndCount);

OpenSim/Framework/ILandObject.cs

@@ -73,9 +73,9 @@ namespace OpenSim.Framework
         bool IsRestrictedFromLand(UUID avatar);
         void SendLandUpdateToClient(IClientAPI remote_client);
         void SendLandUpdateToClient(bool snap_selection, IClientAPI remote_client);
-        List<UUID> CreateAccessListArrayByFlag(AccessList flag);
+        List<LandAccessEntry> 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<ParcelManager.ParcelAccessEntry> entries, IClientAPI remote_client);
+        void UpdateAccessList(uint flags, UUID transactionID, int sequenceID, int sections, List<LandAccessEntry> entries, IClientAPI remote_client);
         void UpdateLandBitmapByteArray();
         void SetLandBitmapFromByteArray();
         bool[,] GetLandBitmap();
@@ -130,5 +130,11 @@ 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(IClientAPI client, int amount);
-        bool AmountCovered(IClientAPI client, int amount);
+        bool UploadCovered(UUID agentID, int amount);
+        bool AmountCovered(UUID agentID, int amount);
         void ApplyCharge(UUID agentID, int amount, string text);
         void ApplyUploadCharge(UUID agentID, int amount, string text);
         void MoveMoney(UUID fromUser, UUID toUser, int amount, string text);

OpenSim/Framework/ISceneEntity.cs

@@ -34,6 +34,7 @@ namespace OpenSim.Framework
         string Name { get; set; }
         UUID UUID { get; }
         uint LocalId { get; }
+
         Vector3 AbsolutePosition { get; }
     }
 }

OpenSim/Framework/ISceneObject.cs

@@ -33,6 +33,12 @@ namespace OpenSim.Framework
     public interface ISceneObject
     {
         UUID UUID { get; }
+
+        /// <summary>
+        /// The owner of this object.
+        /// </summary>
+        UUID OwnerID { get; set; }
+
         ISceneObject CloneForNewScene();
         string ToXml2();
         string ExtraToXmlString();

OpenSim/Framework/LandData.cs

@@ -34,6 +34,13 @@ 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>
@@ -73,7 +80,7 @@ namespace OpenSim.Framework
         private string _mediaURL = String.Empty;
         private string _musicURL = String.Empty;
         private UUID _ownerID = UUID.Zero;
-        private List<ParcelManager.ParcelAccessEntry> _parcelAccessList = new List<ParcelManager.ParcelAccessEntry>();
+        private List<LandAccessEntry> _parcelAccessList = new List<LandAccessEntry>();
         private float _passHours = 0;
         private int _passPrice = 0;
         private int _salePrice = 0; //Unemeplemented. Parcels price.
@@ -450,7 +457,7 @@ namespace OpenSim.Framework
         /// <summary>
         /// List of access data for the parcel.  User data, some bitflags, and a time
         /// </summary>
-        public List<ParcelManager.ParcelAccessEntry> ParcelAccessList {
+        public List<LandAccessEntry> ParcelAccessList {
             get {
                 return _parcelAccessList;
             }
@@ -638,12 +645,12 @@ namespace OpenSim.Framework
             landData._simwidePrims = _simwidePrims;
 
             landData._parcelAccessList.Clear();
-            foreach (ParcelManager.ParcelAccessEntry entry in _parcelAccessList)
+            foreach (LandAccessEntry entry in _parcelAccessList)
             {
-                ParcelManager.ParcelAccessEntry newEntry = new ParcelManager.ParcelAccessEntry();
+                LandAccessEntry newEntry = new LandAccessEntry();
                 newEntry.AgentID = entry.AgentID;
                 newEntry.Flags = entry.Flags;
-                newEntry.Time = entry.Time;
+                newEntry.Expires = entry.Expires;
 
                 landData._parcelAccessList.Add(newEntry);
             }
@@ -668,4 +675,4 @@ namespace OpenSim.Framework
             return land;
         }
     }
-}
+}

OpenSim/Framework/RegionInfo.cs

@@ -450,13 +450,17 @@ namespace OpenSim.Framework
         public string GetOtherSetting(string key)
         {
             string val;
-            m_otherSettings.TryGetValue(key, out val);
-            return 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)
         {
-            m_otherSettings[key] = value;
+            string keylower = key.ToLower();
+            m_otherSettings[keylower] = value;
         }
 
         private void ReadNiniConfig(IConfigSource source, string name)
@@ -498,12 +502,12 @@ namespace OpenSim.Framework
             HashSet<String> allKeys = new HashSet<String>();
             foreach (string s in config.GetKeys())
             {
-                allKeys.Add(s.ToLower());
+                allKeys.Add(s);
             }
 
             // RegionUUID
             //
-            allKeys.Remove(("RegionUUID").ToLower());
+            allKeys.Remove("RegionUUID");
             string regionUUID = config.GetString("RegionUUID", string.Empty);
             if (regionUUID == String.Empty)
             {
@@ -518,7 +522,7 @@ namespace OpenSim.Framework
 
             // Location
             //
-            allKeys.Remove(("Location").ToLower());
+            allKeys.Remove("Location");
             string location = config.GetString("Location", String.Empty);
             if (location == String.Empty)
             {
@@ -534,7 +538,7 @@ namespace OpenSim.Framework
             // InternalAddress
             //
             IPAddress address;
-            allKeys.Remove(("InternalAddress").ToLower());
+            allKeys.Remove("InternalAddress");
             if (config.Contains("InternalAddress"))
             {
                 address = IPAddress.Parse(config.GetString("InternalAddress", String.Empty));
@@ -548,7 +552,7 @@ namespace OpenSim.Framework
             // InternalPort
             //
             int port;
-            allKeys.Remove(("InternalPort").ToLower());
+            allKeys.Remove("InternalPort");
             if (config.Contains("InternalPort"))
             {
                 port = config.GetInt("InternalPort", 9000);
@@ -562,7 +566,7 @@ namespace OpenSim.Framework
 
             // AllowAlternatePorts
             //
-            allKeys.Remove(("AllowAlternatePorts").ToLower());
+            allKeys.Remove("AllowAlternatePorts");
             if (config.Contains("AllowAlternatePorts"))
             {
                 m_allow_alternate_ports = config.GetBoolean("AllowAlternatePorts", true);
@@ -576,7 +580,7 @@ namespace OpenSim.Framework
 
             // ExternalHostName
             //
-            allKeys.Remove(("ExternalHostName").ToLower());
+            allKeys.Remove("ExternalHostName");
             string externalName;
             if (config.Contains("ExternalHostName"))
             {
@@ -601,29 +605,29 @@ namespace OpenSim.Framework
 
             // RegionType
             m_regionType = config.GetString("RegionType", String.Empty);
-            allKeys.Remove(("RegionType").ToLower());
+            allKeys.Remove("RegionType");
 
             // Prim stuff
             //
-            m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 256);
-            allKeys.Remove(("NonphysicalPrimMax").ToLower());
-            m_physPrimMax = config.GetInt("PhysicalPrimMax", 10);
-            allKeys.Remove(("PhysicalPrimMax").ToLower());
+            m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 0);
+            allKeys.Remove("NonphysicalPrimMax");
+            m_physPrimMax = config.GetInt("PhysicalPrimMax", 0);
+            allKeys.Remove("PhysicalPrimMax");
             m_clampPrimSize = config.GetBoolean("ClampPrimSize", false);
-            allKeys.Remove(("ClampPrimSize").ToLower());
+            allKeys.Remove("ClampPrimSize");
             m_objectCapacity = config.GetInt("MaxPrims", 15000);
-            allKeys.Remove(("MaxPrims").ToLower());
+            allKeys.Remove("MaxPrims");
             m_agentCapacity = config.GetInt("MaxAgents", 100);
-            allKeys.Remove(("MaxAgents").ToLower());
+            allKeys.Remove("MaxAgents");
 
             // Multi-tenancy
             //
             ScopeID = new UUID(config.GetString("ScopeID", UUID.Zero.ToString()));
-            allKeys.Remove(("ScopeID").ToLower());
+            allKeys.Remove("ScopeID");
 
             foreach (String s in allKeys)
             {
-                m_otherSettings.Add(s, config.GetString(s));
+                SetOtherSetting(s, config.GetString(s));
             }
         }
 

OpenSim/Framework/RegionSettings.cs

@@ -26,11 +26,53 @@
  */
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using OpenMetaverse;
 
 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;
+        }
+    }
+
     public class RegionSettings
     {
         public delegate void SaveDelegate(RegionSettings rs);
@@ -331,6 +373,14 @@ 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
@@ -363,6 +413,14 @@ 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
         {
@@ -410,5 +468,58 @@ namespace OpenSim.Framework
             get { return m_Casino; }
             set { m_Casino = value; }
         }
+
+        // Telehub support
+        private bool m_TelehubEnabled = false;
+        public bool HasTelehub
+        {
+            get { return m_TelehubEnabled; }
+            set { m_TelehubEnabled = value; }
+        }
+
+        // Connected Telehub object
+        private UUID m_TelehubObject;
+        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/Serialization/External/ExternalRepresentationUtils.cs

@@ -24,11 +24,13 @@
  * (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;
 
@@ -39,18 +41,86 @@ 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>
+        public static void ExecuteReadProcessors<NodeType>(
+            NodeType nodeToFill, Dictionary<string, Action<NodeType, XmlTextReader>> processors, XmlTextReader xtr)
+        {
+            ExecuteReadProcessors(
+                nodeToFill,
+                processors,
+                xtr,
+                (o, name, e)
+                    => m_log.ErrorFormat(
+                        "[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>
+        public static void ExecuteReadProcessors<NodeType>(
+            NodeType nodeToFill,
+            Dictionary<string, Action<NodeType, XmlTextReader>> processors,
+            XmlTextReader xtr,
+            Action<NodeType, string, Exception> parseExceptionAction)
+        {
+            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)
+                    {
+                        parseExceptionAction(nodeToFill, nodeName, e);
+
+                        if (xtr.NodeType == XmlNodeType.EndElement)
+                            xtr.Read();
+                    }
+                }
+                else
+                {
+                    // m_log.DebugFormat("[LandDataSerializer]: caught unknown element {0}", nodeName);
+                    xtr.ReadOuterXml(); // ignore
+                }
+            }
+        }
+
         /// <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="profileURL">The URL of the profile service for the creator</param>
+        /// <param name="homeURL">The URL of the user agents service (home) 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 profileURL, IUserAccountService userService, UUID scopeID)
+        public static string RewriteSOP(string xml, string homeURL, IUserAccountService userService, UUID scopeID)
         {
-            if (xml == string.Empty || profileURL == string.Empty || userService == null)
+            if (xml == string.Empty || homeURL == string.Empty || userService == null)
                 return xml;
 
             XmlDocument doc = new XmlDocument();
@@ -83,7 +153,7 @@ namespace OpenSim.Framework.Serialization.External
                 if (!hasCreatorData && creator != null)
                 {
                     XmlElement creatorData = doc.CreateElement("CreatorData");
-                    creatorData.InnerText = profileURL + "/" + creator.PrincipalID + ";" + creator.FirstName + " " + creator.LastName;
+                    creatorData.InnerText = homeURL + ";" + creator.FirstName + " " + creator.LastName;
                     sop.AppendChild(creatorData);
                 }
             }

OpenSim/Framework/Serialization/External/LandDataSerializer.cs

@@ -28,8 +28,10 @@
 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;
 
@@ -40,8 +42,119 @@ namespace OpenSim.Framework.Serialization.External
     /// </summary>
     public class LandDataSerializer
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding();
 
+        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(
+                "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();
+        }
+
         /// <summary>
         /// Reify/deserialize landData
         /// </summary>
@@ -63,69 +176,14 @@ namespace OpenSim.Framework.Serialization.External
         {
             LandData landData = new LandData();
 
-            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)
+            using (XmlTextReader reader = new XmlTextReader(new StringReader(serializedLandData)))
             {
-                while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement)
-                {
-                    ParcelManager.ParcelAccessEntry pae = new ParcelManager.ParcelAccessEntry();
+                reader.ReadStartElement("LandData");
 
-                    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();
+                ExternalRepresentationUtils.ExecuteReadProcessors<LandData>(landData, m_ldProcessors, reader);
 
-                    landData.ParcelAccessList.Add(pae);
-                }
+                reader.ReadEndElement();
             }
-            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;
         }
@@ -162,11 +220,11 @@ namespace OpenSim.Framework.Serialization.External
             xtw.WriteElementString("OwnerID",        landData.OwnerID.ToString());
 
             xtw.WriteStartElement("ParcelAccessList");
-            foreach (ParcelManager.ParcelAccessEntry pal in landData.ParcelAccessList)
+            foreach (LandAccessEntry pal in landData.ParcelAccessList)
             {
                 xtw.WriteStartElement("ParcelAccessEntry");
                 xtw.WriteElementString("AgentID",     pal.AgentID.ToString());
-                xtw.WriteElementString("Time",        pal.Time.ToString("s"));
+                xtw.WriteElementString("Time",        pal.Expires.ToString());
                 xtw.WriteElementString("AccessList",  Convert.ToString((uint)pal.Flags));
                 xtw.WriteEndElement();
             }

OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs

@@ -41,14 +41,13 @@ namespace OpenSim.Framework.Serialization.External
 {        
     /// <summary>
     /// Serialize and deserialize user inventory items as an external format.
-    /// </summary> 
-    /// XXX: Please do not use yet.
+    /// </summary>
     public class UserInventoryItemSerializer
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private delegate void InventoryItemXmlProcessor(InventoryItemBase item, XmlTextReader reader);
-        private static Dictionary<string, InventoryItemXmlProcessor> m_InventoryItemXmlProcessors = new Dictionary<string, InventoryItemXmlProcessor>();
+        private static Dictionary<string, Action<InventoryItemBase, XmlTextReader>> m_InventoryItemXmlProcessors
+            = new Dictionary<string, Action<InventoryItemBase, XmlTextReader>>();
 
         #region InventoryItemBase Processor initialization 
         static UserInventoryItemSerializer()
@@ -205,39 +204,14 @@ namespace OpenSim.Framework.Serialization.External
             {
                 reader.ReadStartElement("InventoryItem");
 
-                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
-                    }
-
-                }
+                ExternalRepresentationUtils.ExecuteReadProcessors<InventoryItemBase>(
+                    item, m_InventoryItemXmlProcessors, reader);
 
                 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)
@@ -305,14 +279,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("profile"))
+            else if (options.ContainsKey("home"))
             {
                 if (userAccountService != null)
                 {
                     UserAccount account = userAccountService.GetUserAccount(UUID.Zero, inventoryItem.CreatorIdAsUuid);
                     if (account != null)
                     {
-                        writer.WriteElementString("CreatorData", (string)options["profile"] + "/" + inventoryItem.CreatorIdAsUuid + ";" + account.FirstName + " " + account.LastName);
+                        writer.WriteElementString("CreatorData", (string)options["home"] + "/" + inventoryItem.CreatorIdAsUuid + ";" + account.FirstName + " " + account.LastName);
                     }
                     writer.WriteElementString("CreatorID", inventoryItem.CreatorId);
                 }

OpenSim/Framework/Serialization/External/UserProfileSerializer.cs

@@ -33,8 +33,11 @@ using OpenSim.Framework;
 namespace OpenSim.Framework.Serialization.External
 {
     /// <summary>
-    /// Serialize and deserialize region settings as an external format.
+    /// Serialize and deserialize user profiles as an external format.
     /// </summary>
+    /// <remarks>
+    /// Currently UNUSED.
+    /// </remarks>
     public class UserProfileSerializer
     {
         public const int MAJOR_VERSION = 0;

OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs

@@ -27,11 +27,12 @@
 
 using System;
 using System.Collections.Generic;
-using OpenSim.Framework;
-using OpenSim.Framework.Serialization.External;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 using NUnit.Framework;
+using OpenSim.Framework;
+using OpenSim.Framework.Serialization.External;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Framework.Serialization.Tests
 {
@@ -42,7 +43,7 @@ namespace OpenSim.Framework.Serialization.Tests
         private LandData landWithParcelAccessList;
 
         private static string preSerialized = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n<LandData>\n  <Area>128</Area>\n  <AuctionID>0</AuctionID>\n  <AuthBuyerID>00000000-0000-0000-0000-000000000000</AuthBuyerID>\n  <Category>10</Category>\n  <ClaimDate>0</ClaimDate>\n  <ClaimPrice>0</ClaimPrice>\n  <GlobalID>54ff9641-dd40-4a2c-b1f1-47dd3af24e50</GlobalID>\n  <GroupID>d740204e-bbbf-44aa-949d-02c7d739f6a5</GroupID>\n  <IsGroupOwned>False</IsGroupOwned>\n  <Bitmap>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</Bitmap>\n  <Description>land data to test LandDataSerializer</Description>\n  <Flags>536870944</Flags>\n  <LandingType>2</LandingType>\n  <Name>LandDataSerializerTest Land</Name>\n  <Status>0</Status>\n  <LocalID>0</LocalID>\n  <MediaAutoScale>1</MediaAutoScale>\n  <MediaID>d4452578-2f25-4b97-a81b-819af559cfd7</MediaID>\n  <MediaURL>http://videos.opensimulator.org/bumblebee.mp4</MediaURL>\n  <MusicURL />\n  <OwnerID>1b8eedf9-6d15-448b-8015-24286f1756bf</OwnerID>\n  <ParcelAccessList />\n  <PassHours>0</PassHours>\n  <PassPrice>0</PassPrice>\n  <SalePrice>0</SalePrice>\n  <SnapshotID>00000000-0000-0000-0000-000000000000</SnapshotID>\n  <UserLocation>&lt;0, 0, 0&gt;</UserLocation>\n  <UserLookAt>&lt;0, 0, 0&gt;</UserLookAt>\n  <Dwell>0</Dwell>\n  <OtherCleanTime>0</OtherCleanTime>\n</LandData>";
-        private static string preSerializedWithParcelAccessList = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n<LandData>\n  <Area>128</Area>\n  <AuctionID>0</AuctionID>\n  <AuthBuyerID>00000000-0000-0000-0000-000000000000</AuthBuyerID>\n  <Category>10</Category>\n  <ClaimDate>0</ClaimDate>\n  <ClaimPrice>0</ClaimPrice>\n  <GlobalID>54ff9641-dd40-4a2c-b1f1-47dd3af24e50</GlobalID>\n  <GroupID>d740204e-bbbf-44aa-949d-02c7d739f6a5</GroupID>\n  <IsGroupOwned>False</IsGroupOwned>\n  <Bitmap>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</Bitmap>\n  <Description>land data to test LandDataSerializer</Description>\n  <Flags>536870944</Flags>\n  <LandingType>2</LandingType>\n  <Name>LandDataSerializerTest Land</Name>\n  <Status>0</Status>\n  <LocalID>0</LocalID>\n  <MediaAutoScale>1</MediaAutoScale>\n  <MediaID>d4452578-2f25-4b97-a81b-819af559cfd7</MediaID>\n  <MediaURL>http://videos.opensimulator.org/bumblebee.mp4</MediaURL>\n  <MusicURL />\n  <OwnerID>1b8eedf9-6d15-448b-8015-24286f1756bf</OwnerID>\n  <ParcelAccessList>\n    <ParcelAccessEntry>\n      <AgentID>62d65d45-c91a-4f77-862c-46557d978b6c</AgentID>\n      <Time>2009-10-01T00:00:00</Time>\n      <AccessList>2</AccessList>\n    </ParcelAccessEntry>\n    <ParcelAccessEntry>\n      <AgentID>ec2a8d18-2378-4fe0-8b68-2a31b57c481e</AgentID>\n      <Time>2010-10-20T00:00:00</Time>\n      <AccessList>1</AccessList>\n    </ParcelAccessEntry>\n  </ParcelAccessList>\n  <PassHours>0</PassHours>\n  <PassPrice>0</PassPrice>\n  <SalePrice>0</SalePrice>\n  <SnapshotID>00000000-0000-0000-0000-000000000000</SnapshotID>\n  <UserLocation>&lt;0, 0, 0&gt;</UserLocation>\n  <UserLookAt>&lt;0, 0, 0&gt;</UserLookAt>\n  <Dwell>0</Dwell>\n  <OtherCleanTime>0</OtherCleanTime>\n</LandData>";  
+        private static string preSerializedWithParcelAccessList = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n<LandData>\n  <Area>128</Area>\n  <AuctionID>0</AuctionID>\n  <AuthBuyerID>00000000-0000-0000-0000-000000000000</AuthBuyerID>\n  <Category>10</Category>\n  <ClaimDate>0</ClaimDate>\n  <ClaimPrice>0</ClaimPrice>\n  <GlobalID>54ff9641-dd40-4a2c-b1f1-47dd3af24e50</GlobalID>\n  <GroupID>d740204e-bbbf-44aa-949d-02c7d739f6a5</GroupID>\n  <IsGroupOwned>False</IsGroupOwned>\n  <Bitmap>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</Bitmap>\n  <Description>land data to test LandDataSerializer</Description>\n  <Flags>536870944</Flags>\n  <LandingType>2</LandingType>\n  <Name>LandDataSerializerTest Land</Name>\n  <Status>0</Status>\n  <LocalID>0</LocalID>\n  <MediaAutoScale>1</MediaAutoScale>\n  <MediaID>d4452578-2f25-4b97-a81b-819af559cfd7</MediaID>\n  <MediaURL>http://videos.opensimulator.org/bumblebee.mp4</MediaURL>\n  <MusicURL />\n  <OwnerID>1b8eedf9-6d15-448b-8015-24286f1756bf</OwnerID>\n  <ParcelAccessList>\n    <ParcelAccessEntry>\n      <AgentID>62d65d45-c91a-4f77-862c-46557d978b6c</AgentID>\n      <Time>0</Time>\n      <AccessList>2</AccessList>\n    </ParcelAccessEntry>\n    <ParcelAccessEntry>\n      <AgentID>ec2a8d18-2378-4fe0-8b68-2a31b57c481e</AgentID>\n      <Time>0</Time>\n      <AccessList>1</AccessList>\n    </ParcelAccessEntry>\n  </ParcelAccessList>\n  <PassHours>0</PassHours>\n  <PassPrice>0</PassPrice>\n  <SalePrice>0</SalePrice>\n  <SnapshotID>00000000-0000-0000-0000-000000000000</SnapshotID>\n  <UserLocation>&lt;0, 0, 0&gt;</UserLocation>\n  <UserLookAt>&lt;0, 0, 0&gt;</UserLookAt>\n  <Dwell>0</Dwell>\n  <OtherCleanTime>0</OtherCleanTime>\n</LandData>";  
 
         [SetUp]
         public void setup()
@@ -73,16 +74,16 @@ namespace OpenSim.Framework.Serialization.Tests
             this.landWithParcelAccessList = this.land.Copy();
             this.landWithParcelAccessList.ParcelAccessList.Clear();
 
-            ParcelManager.ParcelAccessEntry pae0 = new ParcelManager.ParcelAccessEntry();
+            LandAccessEntry pae0 = new LandAccessEntry();
             pae0.AgentID = new UUID("62d65d45-c91a-4f77-862c-46557d978b6c");
             pae0.Flags = AccessList.Ban;
-            pae0.Time = new DateTime(2009, 10, 01);
+            pae0.Expires = 0;
             this.landWithParcelAccessList.ParcelAccessList.Add(pae0);
 
-            ParcelManager.ParcelAccessEntry pae1 = new ParcelManager.ParcelAccessEntry();
+            LandAccessEntry pae1 = new LandAccessEntry();
             pae1.AgentID = new UUID("ec2a8d18-2378-4fe0-8b68-2a31b57c481e");
             pae1.Flags = AccessList.Access;
-            pae1.Time = new DateTime(2010, 10, 20);
+            pae1.Expires = 0;
             this.landWithParcelAccessList.ParcelAccessList.Add(pae1);
         }
 
@@ -92,6 +93,8 @@ namespace OpenSim.Framework.Serialization.Tests
         [Test]
         public void LandDataSerializerSerializeTest()
         {
+            TestHelpers.InMethod();
+
             string serialized = LandDataSerializer.Serialize(this.land).Replace("\r\n", "\n");
             Assert.That(serialized.Length > 0, "Serialize(LandData) returned empty string");
 
@@ -112,20 +115,32 @@ namespace OpenSim.Framework.Serialization.Tests
         /// Test the LandDataSerializer.Deserialize() method
         /// </summary>
         [Test]
-        public void TestLandDataSerializerDeserializeFromStringTest()
+        public void TestLandDataDeserializeNoAccessLists()
         {
-            LandData reifiedLandData = LandDataSerializer.Deserialize(LandDataSerializerTest.preSerialized);
-            Assert.That(reifiedLandData != null, "Deserialize(string) returned null");
-            Assert.That(reifiedLandData.GlobalID == this.land.GlobalID, "Reified LandData.GlobalID != original LandData.GlobalID");
-            Assert.That(reifiedLandData.Name == this.land.Name, "Reified LandData.Name != original LandData.Name");
+            TestHelpers.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
 
-            LandData reifiedLandDataWithParcelAccessList = LandDataSerializer.Deserialize(LandDataSerializerTest.preSerializedWithParcelAccessList);
-            Assert.That(reifiedLandDataWithParcelAccessList != null, 
+            LandData ld = LandDataSerializer.Deserialize(LandDataSerializerTest.preSerialized);
+            Assert.That(ld != null, "Deserialize(string) returned null");
+            Assert.That(ld.GlobalID == this.land.GlobalID, "Reified LandData.GlobalID != original LandData.GlobalID");
+            Assert.That(ld.Name == this.land.Name, "Reified LandData.Name != original LandData.Name");
+        }
+
+        [Test]
+        public void TestLandDataDeserializeWithAccessLists()
+        {
+            TestHelpers.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+
+            LandData ld = LandDataSerializer.Deserialize(LandDataSerializerTest.preSerializedWithParcelAccessList);
+            Assert.That(ld != null,
                         "Deserialize(string) returned null (pre-serialized with parcel access list)");
-            Assert.That(reifiedLandDataWithParcelAccessList.GlobalID == this.landWithParcelAccessList.GlobalID, 
+            Assert.That(ld.GlobalID == this.landWithParcelAccessList.GlobalID,
                         "Reified LandData.GlobalID != original LandData.GlobalID (pre-serialized with parcel access list)");
-            Assert.That(reifiedLandDataWithParcelAccessList.Name == this.landWithParcelAccessList.Name, 
+            Assert.That(ld.Name == this.landWithParcelAccessList.Name,
                         "Reified LandData.Name != original LandData.Name (pre-serialized with parcel access list)");
+            Assert.That(ld.ParcelAccessList.Count, Is.EqualTo(2));
+            Assert.That(ld.ParcelAccessList[0].AgentID, Is.EqualTo(UUID.Parse("62d65d45-c91a-4f77-862c-46557d978b6c")));
         }
     }
-}
+}

OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs

@@ -0,0 +1,134 @@
+/*
+ * 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;
+using OpenMetaverse.StructuredData;
+using NUnit.Framework;
+using OpenSim.Framework;
+using OpenSim.Framework.Serialization.External;
+using OpenSim.Tests.Common;
+
+namespace OpenSim.Framework.Serialization.Tests
+{
+    [TestFixture]
+    public class RegionSettingsSerializerTests
+    {
+        private string m_serializedRs = @"<?xml version=""1.0"" encoding=""utf-16""?>
+<RegionSettings>
+  <General>
+    <AllowDamage>True</AllowDamage>
+    <AllowLandResell>True</AllowLandResell>
+    <AllowLandJoinDivide>True</AllowLandJoinDivide>
+    <BlockFly>True</BlockFly>
+    <BlockLandShowInSearch>True</BlockLandShowInSearch>
+    <BlockTerraform>True</BlockTerraform>
+    <DisableCollisions>True</DisableCollisions>
+    <DisablePhysics>True</DisablePhysics>
+    <DisableScripts>True</DisableScripts>
+    <MaturityRating>1</MaturityRating>
+    <RestrictPushing>True</RestrictPushing>
+    <AgentLimit>40</AgentLimit>
+    <ObjectBonus>1.4</ObjectBonus>
+  </General>
+  <GroundTextures>
+    <Texture1>00000000-0000-0000-0000-000000000020</Texture1>
+    <Texture2>00000000-0000-0000-0000-000000000040</Texture2>
+    <Texture3>00000000-0000-0000-0000-000000000060</Texture3>
+    <Texture4>00000000-0000-0000-0000-000000000080</Texture4>
+    <ElevationLowSW>1.9</ElevationLowSW>
+    <ElevationLowNW>15.9</ElevationLowNW>
+    <ElevationLowSE>49</ElevationLowSE>
+    <ElevationLowNE>45.3</ElevationLowNE>
+    <ElevationHighSW>2.1</ElevationHighSW>
+    <ElevationHighNW>4.5</ElevationHighNW>
+    <ElevationHighSE>9.2</ElevationHighSE>
+    <ElevationHighNE>19.2</ElevationHighNE>
+  </GroundTextures>
+  <Terrain>
+    <WaterHeight>23</WaterHeight>
+    <TerrainRaiseLimit>17.9</TerrainRaiseLimit>
+    <TerrainLowerLimit>0.4</TerrainLowerLimit>
+    <UseEstateSun>True</UseEstateSun>
+    <FixedSun>true</FixedSun>
+    <SunPosition>12</SunPosition>
+  </Terrain>
+</RegionSettings>";
+
+        private RegionSettings m_rs;
+
+        [SetUp]
+        public void Setup()
+        {
+            m_rs = new RegionSettings();
+            m_rs.AgentLimit = 17;
+            m_rs.AllowDamage = true;
+            m_rs.AllowLandJoinDivide = true;
+            m_rs.AllowLandResell = true;
+            m_rs.BlockFly = true;
+            m_rs.BlockShowInSearch = true;
+            m_rs.BlockTerraform = true;
+            m_rs.DisableCollisions = true;
+            m_rs.DisablePhysics = true;
+            m_rs.DisableScripts = true;
+            m_rs.Elevation1NW = 15.9;
+            m_rs.Elevation1NE = 45.3;
+            m_rs.Elevation1SE = 49;
+            m_rs.Elevation1SW = 1.9;
+            m_rs.Elevation2NW = 4.5;
+            m_rs.Elevation2NE = 19.2;
+            m_rs.Elevation2SE = 9.2;
+            m_rs.Elevation2SW = 2.1;
+            m_rs.FixedSun = true;
+            m_rs.SunPosition = 12.0;
+            m_rs.ObjectBonus = 1.4;
+            m_rs.RestrictPushing = true;
+            m_rs.TerrainLowerLimit = 0.4;
+            m_rs.TerrainRaiseLimit = 17.9;
+            m_rs.TerrainTexture1 = UUID.Parse("00000000-0000-0000-0000-000000000020");
+            m_rs.TerrainTexture2 = UUID.Parse("00000000-0000-0000-0000-000000000040");
+            m_rs.TerrainTexture3 = UUID.Parse("00000000-0000-0000-0000-000000000060");
+            m_rs.TerrainTexture4 = UUID.Parse("00000000-0000-0000-0000-000000000080");
+            m_rs.UseEstateSun = true;
+            m_rs.WaterHeight = 23;
+        }
+
+        [Test]
+        public void TestRegionSettingsDeserialize()
+        {
+            TestHelpers.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+
+            RegionSettings deserRs = RegionSettingsSerializer.Deserialize(m_serializedRs);
+            Assert.That(deserRs, Is.Not.Null);
+            Assert.That(deserRs.TerrainTexture2, Is.EqualTo(m_rs.TerrainTexture2));
+            Assert.That(deserRs.DisablePhysics, Is.EqualTo(m_rs.DisablePhysics));
+            Assert.That(deserRs.TerrainLowerLimit, Is.EqualTo(m_rs.TerrainLowerLimit));
+        }
+    }
+}

OpenSim/Framework/Servers/BaseOpenSimServer.cs

@@ -251,7 +251,7 @@ namespace OpenSim.Framework.Servers
 
             sb.Append(threads.Length + " threads are being tracked:" + Environment.NewLine);
 
-            int timeNow = Util.EnvironmentTickCount();
+            int timeNow = Environment.TickCount & Int32.MaxValue;
 
             sb.AppendFormat(reportFormat, "ID", "NAME", "LAST UPDATE (MS)", "LIFETIME (MS)", "PRIORITY", "STATE");
             sb.Append(Environment.NewLine);

OpenSim/Framework/Statistics/SimExtraStatsCollector.cs

@@ -42,15 +42,15 @@ namespace OpenSim.Framework.Statistics
     {
         private long abnormalClientThreadTerminations;
 
-        private long assetsInCache;
-        private long texturesInCache;
-        private long assetCacheMemoryUsage;
-        private long textureCacheMemoryUsage;
-        private TimeSpan assetRequestTimeAfterCacheMiss;
-        private long blockedMissingTextureRequests;
+//        private long assetsInCache;
+//        private long texturesInCache;
+//        private long assetCacheMemoryUsage;
+//        private long textureCacheMemoryUsage;
+//        private TimeSpan assetRequestTimeAfterCacheMiss;
+//        private long blockedMissingTextureRequests;
 
-        private long assetServiceRequestFailures;
-        private long inventoryServiceRetrievalFailures;
+//        private long assetServiceRequestFailures;
+//        private long inventoryServiceRetrievalFailures;
 
         private volatile float timeDilation;
         private volatile float simFps;
@@ -79,27 +79,27 @@ namespace OpenSim.Framework.Statistics
         /// </summary>
         public long AbnormalClientThreadTerminations { get { return abnormalClientThreadTerminations; } }
 
-        /// <summary>
-        /// These statistics are being collected by push rather than pull.  Pull would be simpler, but I had the
-        /// notion of providing some flow statistics (which pull wouldn't give us).  Though admittedly these
-        /// haven't yet been implemented...
-        /// </summary>
-        public long AssetsInCache { get { return assetsInCache; } }
-        
-        /// <value>
-        /// Currently unused
-        /// </value>
-        public long TexturesInCache { get { return texturesInCache; } }
-        
-        /// <value>
-        /// Currently misleading since we can't currently subtract removed asset memory usage without a performance hit
-        /// </value>
-        public long AssetCacheMemoryUsage { get { return assetCacheMemoryUsage; } }
-        
-        /// <value>
-        /// Currently unused
-        /// </value>
-        public long TextureCacheMemoryUsage { get { return textureCacheMemoryUsage; } }
+//        /// <summary>
+//        /// These statistics are being collected by push rather than pull.  Pull would be simpler, but I had the
+//        /// notion of providing some flow statistics (which pull wouldn't give us).  Though admittedly these
+//        /// haven't yet been implemented...
+//        /// </summary>
+//        public long AssetsInCache { get { return assetsInCache; } }
+//        
+//        /// <value>
+//        /// Currently unused
+//        /// </value>
+//        public long TexturesInCache { get { return texturesInCache; } }
+//        
+//        /// <value>
+//        /// Currently misleading since we can't currently subtract removed asset memory usage without a performance hit
+//        /// </value>
+//        public long AssetCacheMemoryUsage { get { return assetCacheMemoryUsage; } }
+//        
+//        /// <value>
+//        /// Currently unused
+//        /// </value>
+//        public long TextureCacheMemoryUsage { get { return textureCacheMemoryUsage; } }
 
         public float TimeDilation { get { return timeDilation; } }
         public float SimFps { get { return simFps; } }
@@ -123,32 +123,33 @@ namespace OpenSim.Framework.Statistics
         public float ActiveScripts { get { return activeScripts; } }
         public float ScriptLinesPerSecond { get { return scriptLinesPerSecond; } }
         
-        /// <summary>
-        /// This is the time it took for the last asset request made in response to a cache miss.
-        /// </summary>
-        public TimeSpan AssetRequestTimeAfterCacheMiss { get { return assetRequestTimeAfterCacheMiss; } }
-
-        /// <summary>
-        /// Number of persistent requests for missing textures we have started blocking from clients.  To some extent
-        /// this is just a temporary statistic to keep this problem in view - the root cause of this lies either
-        /// in a mishandling of the reply protocol, related to avatar appearance or may even originate in graphics
-        /// driver bugs on clients (though this seems less likely).
-        /// </summary>
-        public long BlockedMissingTextureRequests { get { return blockedMissingTextureRequests; } }
-
-        /// <summary>
-        /// Record the number of times that an asset request has failed.  Failures are effectively exceptions, such as
-        /// request timeouts.  If an asset service replies that a particular asset cannot be found, this is not counted
-        /// as a failure
-        /// </summary>
-        public long AssetServiceRequestFailures { get { return assetServiceRequestFailures; } }
+//        /// <summary>
+//        /// This is the time it took for the last asset request made in response to a cache miss.
+//        /// </summary>
+//        public TimeSpan AssetRequestTimeAfterCacheMiss { get { return assetRequestTimeAfterCacheMiss; } }
+//
+//        /// <summary>
+//        /// Number of persistent requests for missing textures we have started blocking from clients.  To some extent
+//        /// this is just a temporary statistic to keep this problem in view - the root cause of this lies either
+//        /// in a mishandling of the reply protocol, related to avatar appearance or may even originate in graphics
+//        /// driver bugs on clients (though this seems less likely).
+//        /// </summary>
+//        public long BlockedMissingTextureRequests { get { return blockedMissingTextureRequests; } }
+//
+//        /// <summary>
+//        /// Record the number of times that an asset request has failed.  Failures are effectively exceptions, such as
+//        /// request timeouts.  If an asset service replies that a particular asset cannot be found, this is not counted
+//        /// as a failure
+//        /// </summary>
+//        public long AssetServiceRequestFailures { get { return assetServiceRequestFailures; } }
 
         /// <summary>
         /// Number of known failures to retrieve avatar inventory from the inventory service.  This does not
         /// cover situations where the inventory service accepts the request but never returns any data, since
         /// we do not yet timeout this situation.
         /// </summary>
-        public long InventoryServiceRetrievalFailures { get { return inventoryServiceRetrievalFailures; } }
+        /// <remarks>Commented out because we do not cache inventory at this point</remarks>
+//        public long InventoryServiceRetrievalFailures { get { return inventoryServiceRetrievalFailures; } }
 
         /// <summary>
         /// Retrieve the total frame time (in ms) of the last frame
@@ -171,58 +172,58 @@ namespace OpenSim.Framework.Statistics
             abnormalClientThreadTerminations++;
         }
 
-        public void AddAsset(AssetBase asset)
-        {
-            assetsInCache++;
-            //assetCacheMemoryUsage += asset.Data.Length;
-        }
-        
-        public void RemoveAsset(UUID uuid)
-        {
-            assetsInCache--;
-        }
+//        public void AddAsset(AssetBase asset)
+//        {
+//            assetsInCache++;
+//            //assetCacheMemoryUsage += asset.Data.Length;
+//        }
+//        
+//        public void RemoveAsset(UUID uuid)
+//        {
+//            assetsInCache--;
+//        }
+//
+//        public void AddTexture(AssetBase image)
+//        {
+//            if (image.Data != null)
+//            {
+//                texturesInCache++;
+//
+//                // This could have been a pull stat, though there was originally a nebulous idea to measure flow rates
+//                textureCacheMemoryUsage += image.Data.Length;
+//            }
+//        }
+//
+//        /// <summary>
+//        /// Signal that the asset cache has been cleared.
+//        /// </summary>
+//        public void ClearAssetCacheStatistics()
+//        {
+//            assetsInCache = 0;
+//            assetCacheMemoryUsage = 0;
+//            texturesInCache = 0;
+//            textureCacheMemoryUsage = 0;
+//        }
+//        
+//        public void AddAssetRequestTimeAfterCacheMiss(TimeSpan ts)
+//        {
+//            assetRequestTimeAfterCacheMiss = ts;
+//        }
+//
+//        public void AddBlockedMissingTextureRequest()
+//        {
+//            blockedMissingTextureRequests++;
+//        }
+//
+//        public void AddAssetServiceRequestFailure()
+//        {
+//            assetServiceRequestFailures++;
+//        }
 
-        public void AddTexture(AssetBase image)
-        {
-            if (image.Data != null)
-            {
-                texturesInCache++;
-
-                // This could have been a pull stat, though there was originally a nebulous idea to measure flow rates
-                textureCacheMemoryUsage += image.Data.Length;
-            }
-        }
-
-        /// <summary>
-        /// Signal that the asset cache has been cleared.
-        /// </summary>
-        public void ClearAssetCacheStatistics()
-        {
-            assetsInCache = 0;
-            assetCacheMemoryUsage = 0;
-            texturesInCache = 0;
-            textureCacheMemoryUsage = 0;
-        }
-        
-        public void AddAssetRequestTimeAfterCacheMiss(TimeSpan ts)
-        {
-            assetRequestTimeAfterCacheMiss = ts;
-        }
-
-        public void AddBlockedMissingTextureRequest()
-        {
-            blockedMissingTextureRequests++;
-        }
-
-        public void AddAssetServiceRequestFailure()
-        {
-            assetServiceRequestFailures++;
-        }
-
-        public void AddInventoryServiceRetrievalFailure()
-        {
-            inventoryServiceRetrievalFailures++;
-        }
+//        public void AddInventoryServiceRetrievalFailure()
+//        {
+//            inventoryServiceRetrievalFailures++;
+//        }
 
         /// <summary>
         /// Register as a packet queue stats provider
@@ -290,8 +291,8 @@ namespace OpenSim.Framework.Statistics
         public override string Report()
         {
             StringBuilder sb = new StringBuilder(Environment.NewLine);
-            sb.Append("ASSET STATISTICS");
-            sb.Append(Environment.NewLine);
+//            sb.Append("ASSET STATISTICS");
+//            sb.Append(Environment.NewLine);
                         
             /*
             sb.Append(
@@ -307,7 +308,8 @@ Asset service request failures: {6}"+ Environment.NewLine,
                     BlockedMissingTextureRequests,
                     AssetServiceRequestFailures));
             */
-            
+
+            /*
             sb.Append(
                 string.Format(
 @"Asset cache contains   {0,6} assets
@@ -318,7 +320,7 @@ Asset service request failures: {3}" + Environment.NewLine,
                     assetRequestTimeAfterCacheMiss.Milliseconds / 1000.0,
                     BlockedMissingTextureRequests,
                     AssetServiceRequestFailures));
-            
+                    */
 
             sb.Append(Environment.NewLine);
             sb.Append("CONNECTION STATISTICS");
@@ -328,13 +330,13 @@ Asset service request failures: {3}" + Environment.NewLine,
                     "Abnormal client thread terminations: {0}" + Environment.NewLine,
                     abnormalClientThreadTerminations));
 
-            sb.Append(Environment.NewLine);
-            sb.Append("INVENTORY STATISTICS");
-            sb.Append(Environment.NewLine);
-            sb.Append(
-                string.Format(
-                    "Initial inventory caching failures: {0}" + Environment.NewLine,
-                    InventoryServiceRetrievalFailures));
+//            sb.Append(Environment.NewLine);
+//            sb.Append("INVENTORY STATISTICS");
+//            sb.Append(Environment.NewLine);
+//            sb.Append(
+//                string.Format(
+//                    "Initial inventory caching failures: {0}" + Environment.NewLine,
+//                    InventoryServiceRetrievalFailures));
 
             sb.Append(Environment.NewLine);
             sb.Append("FRAME STATISTICS");
@@ -390,17 +392,17 @@ Asset service request failures: {3}" + Environment.NewLine,
         public override string XReport(string uptime, string version)
         {
             OSDMap args = new OSDMap(30);
-            args["AssetsInCache"] = OSD.FromString (String.Format ("{0:0.##}", AssetsInCache));
-            args["TimeAfterCacheMiss"] = OSD.FromString (String.Format ("{0:0.##}",
-                    assetRequestTimeAfterCacheMiss.Milliseconds / 1000.0));
-            args["BlockedMissingTextureRequests"] = OSD.FromString (String.Format ("{0:0.##}",
-                    BlockedMissingTextureRequests));
-            args["AssetServiceRequestFailures"] = OSD.FromString (String.Format ("{0:0.##}",
-                    AssetServiceRequestFailures));
-            args["abnormalClientThreadTerminations"] = OSD.FromString (String.Format ("{0:0.##}",
-                    abnormalClientThreadTerminations));
-            args["InventoryServiceRetrievalFailures"] = OSD.FromString (String.Format ("{0:0.##}",
-                    InventoryServiceRetrievalFailures));
+//            args["AssetsInCache"] = OSD.FromString (String.Format ("{0:0.##}", AssetsInCache));
+//            args["TimeAfterCacheMiss"] = OSD.FromString (String.Format ("{0:0.##}",
+//                    assetRequestTimeAfterCacheMiss.Milliseconds / 1000.0));
+//            args["BlockedMissingTextureRequests"] = OSD.FromString (String.Format ("{0:0.##}",
+//                    BlockedMissingTextureRequests));
+//            args["AssetServiceRequestFailures"] = OSD.FromString (String.Format ("{0:0.##}",
+//                    AssetServiceRequestFailures));
+//            args["abnormalClientThreadTerminations"] = OSD.FromString (String.Format ("{0:0.##}",
+//                    abnormalClientThreadTerminations));
+//            args["InventoryServiceRetrievalFailures"] = OSD.FromString (String.Format ("{0:0.##}",
+//                    InventoryServiceRetrievalFailures));
             args["Dilatn"] = OSD.FromString (String.Format ("{0:0.##}", timeDilation));
             args["SimFPS"] = OSD.FromString (String.Format ("{0:0.##}", simFps));
             args["PhyFPS"] = OSD.FromString (String.Format ("{0:0.##}", physicsFps));

OpenSim/Framework/TaskInventoryItem.cs

@@ -64,7 +64,8 @@ namespace OpenSim.Framework
         private UUID _permsGranter;
         private int _permsMask;
         private int _type = 0;
-        private UUID _oldID = UUID.Zero;
+        private UUID _oldID;
+        private UUID _loadedID = UUID.Zero;
 
         private bool _ownerChanged = false;
         
@@ -234,6 +235,15 @@ namespace OpenSim.Framework
             }
         }
 
+        public UUID LoadedItemID {
+            get {
+                return _loadedID;
+            }
+            set {
+                _loadedID = value;
+            }
+        }
+
         public UUID LastOwnerID {
             get {
                 return _lastOwnerID;
@@ -359,8 +369,8 @@ namespace OpenSim.Framework
         /// <param name="partID">The new part ID to which this item belongs</param>
         public void ResetIDs(UUID partID)
         {
-            if (_oldID == UUID.Zero)
-                _oldID = ItemID;
+            LoadedItemID = OldItemID;
+            OldItemID = ItemID;
             ItemID = UUID.Random();
             ParentPartID = partID;
             ParentID = partID;

OpenSim/Framework/Util.cs

@@ -1676,13 +1676,14 @@ namespace OpenSim.Framework
         /// </summary>
         public static void PrintCallStack()
         {
-            StackTrace stackTrace = new StackTrace();           // get call stack
+            StackTrace stackTrace = new StackTrace(true);           // get call stack
             StackFrame[] stackFrames = stackTrace.GetFrames();  // get method calls (frames)
 
             // write call stack method names
             foreach (StackFrame stackFrame in stackFrames)
             {
-                m_log.Debug(stackFrame.GetMethod().DeclaringType + "." + stackFrame.GetMethod().Name); // write method name
+                MethodBase mb = stackFrame.GetMethod();
+                m_log.DebugFormat("{0}.{1}:{2}", mb.DeclaringType, mb.Name, stackFrame.GetFileLineNumber()); // write method name
             }
         }
 

OpenSim/Region/Application/ConfigurationLoader.cs

@@ -107,15 +107,13 @@ namespace OpenSim
                     }
                     else
                     {
-                        m_log.ErrorFormat("Master ini file {0} not found", masterFilePath);
+                        m_log.ErrorFormat("Master ini file {0} not found", Path.GetFullPath(masterFilePath));
                         Environment.Exit(1);
                     }
                 }
             }
 
-
-            string iniFileName =
-                    startupConfig.GetString("inifile", "OpenSim.ini");
+            string iniFileName = startupConfig.GetString("inifile", "OpenSim.ini");
 
             if (IsUri(iniFileName))
             {
@@ -131,8 +129,7 @@ namespace OpenSim
                 if (!File.Exists(Application.iniFilePath))
                 {
                     iniFileName = "OpenSim.xml";
-                    Application.iniFilePath = Path.GetFullPath(
-                            Path.Combine(Util.configDir(), iniFileName));
+                    Application.iniFilePath = Path.GetFullPath(Path.Combine(Util.configDir(), iniFileName));
                 }
 
                 if (File.Exists(Application.iniFilePath))
@@ -142,15 +139,12 @@ namespace OpenSim
                 }
             }
 
-            string iniDirName =
-                    startupConfig.GetString("inidirectory", "config");
-            string iniDirPath =
-                    Path.Combine(Util.configDir(), iniDirName);
+            string iniDirName = startupConfig.GetString("inidirectory", "config");
+            string iniDirPath = Path.Combine(Util.configDir(), iniDirName);
 
             if (Directory.Exists(iniDirPath))
             {
-                m_log.InfoFormat("Searching folder {0} for config ini files",
-                        iniDirPath);
+                m_log.InfoFormat("Searching folder {0} for config ini files", iniDirPath);
 
                 string[] fileEntries = Directory.GetFiles(iniDirName);
                 foreach (string filePath in fileEntries)
@@ -172,7 +166,6 @@ namespace OpenSim
             if (sources.Count == 0)
             {
                 m_log.FatalFormat("[CONFIG]: Could not load any configuration");
-                m_log.FatalFormat("[CONFIG]: Did you copy the OpenSimDefaults.ini.example file to OpenSimDefaults.ini?");
                 Environment.Exit(1);
             }
 

OpenSim/Region/Application/OpenSim.cs

@@ -188,6 +188,18 @@ namespace OpenSim
                 }
             }
 
+            // Hook up to the watchdog timer
+            Watchdog.OnWatchdogTimeout += WatchdogTimeoutHandler;
+
+            PrintFileToConsole("startuplogo.txt");
+
+            // For now, start at the 'root' level by default
+            if (m_sceneManager.Scenes.Count == 1) // If there is only one region, select it
+                ChangeSelectedRegion("region",
+                                     new string[] {"change", "region", m_sceneManager.Scenes[0].RegionInfo.RegionName});
+            else
+                ChangeSelectedRegion("region", new string[] {"change", "region", "root"});
+
             //Run Startup Commands
             if (String.IsNullOrEmpty(m_startupCommandsFile))
             {
@@ -206,18 +218,6 @@ namespace OpenSim
                 m_scriptTimer.Interval = 1200*1000;
                 m_scriptTimer.Elapsed += RunAutoTimerScript;
             }
-
-            // Hook up to the watchdog timer
-            Watchdog.OnWatchdogTimeout += WatchdogTimeoutHandler;
-
-            PrintFileToConsole("startuplogo.txt");
-
-            // For now, start at the 'root' level by default
-            if (m_sceneManager.Scenes.Count == 1) // If there is only one region, select it
-                ChangeSelectedRegion("region",
-                                     new string[] {"change", "region", m_sceneManager.Scenes[0].RegionInfo.RegionName});
-            else
-                ChangeSelectedRegion("region", new string[] {"change", "region", "root"});
         }
 
         /// <summary>
@@ -250,8 +250,10 @@ namespace OpenSim
                                           + "If level <= 0 then no extra http logging is done.\n",
                                           Debug);
 
+            m_console.Commands.AddCommand("region", false, "debug teleport", "debug teleport", "Toggle teleport route debugging", Debug);
+
             m_console.Commands.AddCommand("region", false, "debug scene",
-                                          "debug scene <cripting> <collisions> <physics>",
+                                          "debug scene <scripting> <collisions> <physics>",
                                           "Turn on scene debugging", Debug);
 
             m_console.Commands.AddCommand("region", false, "change region",
@@ -289,12 +291,16 @@ namespace OpenSim
 
             m_console.Commands.AddCommand("region", false, "save oar",
                                           //"save oar [-v|--version=<N>] [-p|--profile=<url>] [<OAR path>]",
-                                          "save oar [-p|--profile=<url>] [--noassets] [--perm=<permissions>] [<OAR path>]",
+                                          "save oar [-h|--home=<url>] [--noassets] [--publish] [--perm=<permissions>] [<OAR path>]",
                                           "Save a region's data to an OAR archive.",
 //                                          "-v|--version=<N> generates scene objects as per older versions of the serialization (e.g. -v=0)" + Environment.NewLine
-                                          "-p|--profile=<url> adds the url of the profile service to the saved user information." + Environment.NewLine
+                                          "-h|--home=<url> adds the url of the profile service to the saved user information." + Environment.NewLine
                                           + "--noassets stops assets being saved to the OAR." + Environment.NewLine
-                                          + "--perm stops objects with insufficient permissions from being saved to the OAR." + Environment.NewLine
+                                          + "--publish saves an OAR stripped of owner and last owner information." + Environment.NewLine
+                                          + "   on reload, the estate owner will be the owner of all objects" + Environment.NewLine
+                                          + "   this is useful if you're making oars generally available that might be reloaded to the same grid from which you published" + Environment.NewLine
+                                          + "   this option is EXPERIMENTAL" + Environment.NewLine
+                                          + "--perm=<permissions> stops objects with insufficient permissions from being saved to the OAR." + Environment.NewLine
                                           + "   <permissions> can contain one or more of these characters: \"C\" = Copy, \"T\" = Transfer" + Environment.NewLine
                                           + "The OAR path must be a filesystem path."
                                           + " If this is not given then the oar is saved to region.oar in the current directory.",
@@ -796,6 +802,7 @@ namespace OpenSim
                     break;
 
                 case "backup":
+                    MainConsole.Instance.Output("Triggering save of pending object updates to persistent store");
                     m_sceneManager.BackupCurrentScene();
                     break;
 
@@ -806,7 +813,7 @@ namespace OpenSim
                     if (m_sceneManager.TryGetScene(regRemoveName, out removeScene))
                         RemoveRegion(removeScene, false);
                     else
-                        MainConsole.Instance.Output("no region with that name");
+                        MainConsole.Instance.Output("No region with that name");
                     break;
 
                 case "delete-region":
@@ -947,6 +954,21 @@ namespace OpenSim
 
                     break;
 
+                case "teleport":
+                    foreach(Scene s in m_sceneManager.Scenes)
+                    {
+                        if (s.DEBUG)
+                        {
+                            s.DEBUG = false;
+                            MainConsole.Instance.Output("Teleport debugging is disabled!");
+                        }
+                        else{
+                            s.DEBUG = true;
+                            MainConsole.Instance.Output("Teleport debugging is enabled!");
+                        }
+                    }
+                    break;
+
                 default:
                     MainConsole.Instance.Output("Unknown debug command");
                     break;

OpenSim/Region/Application/OpenSimBase.cs

@@ -46,7 +46,7 @@ using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
-using OpenSim.Server.Base;
+using OpenSim.Server.Base;
 using OpenSim.Services.Base;
 using OpenSim.Services.Interfaces;
 using OpenSim.Services.UserAccountService;
@@ -211,16 +211,16 @@ namespace OpenSim
             // Load the simulation data service
             IConfig simDataConfig = m_config.Source.Configs["SimulationDataStore"];
             if (simDataConfig == null)
-                throw new Exception("Configuration file is missing the [SimulationDataStore] section");
+                throw new Exception("Configuration file is missing the [SimulationDataStore] section.  Have you copied OpenSim.ini.example to OpenSim.ini to reference config-include/ files?");
             string module = simDataConfig.GetString("LocalServiceModule", String.Empty);
             if (String.IsNullOrEmpty(module))
-                throw new Exception("Configuration file is missing the LocalServiceModule parameter in the [SimulationDataStore] section");
+                throw new Exception("Configuration file is missing the LocalServiceModule parameter in the [SimulationDataStore] section.");
             m_simulationDataService = ServerUtils.LoadPlugin<ISimulationDataService>(module, new object[] { m_config.Source });
 
             // Load the estate data service
             IConfig estateDataConfig = m_config.Source.Configs["EstateDataStore"];
             if (estateDataConfig == null)
-                throw new Exception("Configuration file is missing the [EstateDataStore] section");
+                throw new Exception("Configuration file is missing the [EstateDataStore] section.  Have you copied OpenSim.ini.example to OpenSim.ini to reference config-include/ files?");
             module = estateDataConfig.GetString("LocalServiceModule", String.Empty);
             if (String.IsNullOrEmpty(module))
                 throw new Exception("Configuration file is missing the LocalServiceModule parameter in the [EstateDataStore] section");
@@ -432,10 +432,14 @@ namespace OpenSim
             // TODO : Try setting resource for region xstats here on scene
             MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); 
             
+            scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
+            scene.EventManager.TriggerParcelPrimCountUpdate();
+
             if (scene.SnmpService != null)
             {
                 scene.SnmpService.BootInfo("Grid Registration in progress", scene);
             } 
+
             try
             {
                 scene.RegisterRegionWithGrid();
@@ -460,9 +464,6 @@ namespace OpenSim
                 scene.SnmpService.BootInfo("Grid Registration done", scene);
             }
 
-            scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
-            scene.EventManager.TriggerParcelPrimCountUpdate();
-
             // We need to do this after we've initialized the
             // scripting engines.
             scene.CreateScriptInstances();

OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs

@@ -94,6 +94,7 @@ namespace OpenSim.Region.ClientStack.Linden
         private static readonly string m_notecardUpdatePath = "0004/";
         private static readonly string m_notecardTaskUpdatePath = "0005/";
         //        private static readonly string m_fetchInventoryPath = "0006/";
+        private static readonly string m_copyFromNotecardPath = "0007/";
         // private static readonly string m_remoteParcelRequestPath = "0009/";// This is in the LandManagementModule.
 
 
@@ -180,6 +181,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 m_HostCapsObj.RegisterHandler("UpdateNotecardAgentInventory", req);
                 m_HostCapsObj.RegisterHandler("UpdateScriptAgentInventory", req);
                 m_HostCapsObj.RegisterHandler("UpdateScriptAgent", req);
+                m_HostCapsObj.RegisterHandler("CopyInventoryFromNotecard", new RestStreamHandler("POST", capsBase + m_copyFromNotecardPath, CopyInventoryFromNotecard));
              
                 // As of RC 1.22.9 of the Linden client this is
                 // supported
@@ -366,7 +368,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
                     if (mm != null)
                     {
-                        if (!mm.UploadCovered(client, mm.UploadCharge))
+                        if (!mm.UploadCovered(client.AgentId, mm.UploadCharge))
                         {
                             if (client != null)
                                 client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
@@ -420,7 +422,7 @@ namespace OpenSim.Region.ClientStack.Linden
                                           string assetType)
         {
             m_log.DebugFormat(
-                "Uploaded asset {0} for inventory item {1}, inv type {2}, asset type {3}",
+                "[BUNCH OF CAPS]: Uploaded asset {0} for inventory item {1}, inv type {2}, asset type {3}",
                 assetID, inventoryItem, inventoryType, assetType);
 
             sbyte assType = 0;
@@ -623,7 +625,12 @@ namespace OpenSim.Region.ClientStack.Linden
             item.AssetType = assType;
             item.InvType = inType;
             item.Folder = parentFolder;
-            item.CurrentPermissions = (uint)PermissionMask.All;
+
+            // If we set PermissionMask.All then when we rez the item the next permissions will replace the current
+            // (owner) permissions.  This becomes a problem if next permissions are changed.
+            item.CurrentPermissions
+                = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer);
+
             item.BasePermissions = (uint)PermissionMask.All;
             item.EveryOnePermissions = 0;
             item.NextPermissions = (uint)PermissionMask.All;
@@ -723,6 +730,75 @@ namespace OpenSim.Region.ClientStack.Linden
 
             return LLSDHelpers.SerialiseLLSDReply(uploadResponse);
         }
+
+        /// <summary>
+        /// Called by the CopyInventoryFromNotecard caps handler.
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="path"></param>
+        /// <param name="param"></param>
+        public string CopyInventoryFromNotecard(string request, string path, string param,
+                                             IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        {
+            Hashtable response = new Hashtable();
+            response["int_response_code"] = 404;
+            response["content_type"] = "text/plain";
+            response["keepalive"] = false;
+            response["str_response_string"] = "";
+
+            try
+            {
+                OSDMap content = (OSDMap)OSDParser.DeserializeLLSDXml(request);
+                UUID objectID = content["object-id"].AsUUID();
+                UUID notecardID = content["notecard-id"].AsUUID();
+                UUID folderID = content["folder-id"].AsUUID();
+                UUID itemID = content["item-id"].AsUUID();
+
+                //  m_log.InfoFormat("[CAPS]: CopyInventoryFromNotecard, FolderID:{0}, ItemID:{1}, NotecardID:{2}, ObjectID:{3}", folderID, itemID, notecardID, objectID);
+
+                if (objectID != UUID.Zero)
+                {
+                    SceneObjectPart part = m_Scene.GetSceneObjectPart(objectID);
+                    if (part != null)
+                    {
+                        TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(notecardID);
+                        if (!m_Scene.Permissions.CanCopyObjectInventory(notecardID, objectID, m_HostCapsObj.AgentID))
+                        {
+                            return LLSDHelpers.SerialiseLLSDReply(response);
+                        }
+                    }
+                }
+
+                InventoryItemBase item = null;
+                InventoryItemBase copyItem = null;
+                IClientAPI client = null;
+
+                m_Scene.TryGetClient(m_HostCapsObj.AgentID, out client);
+                item = m_Scene.InventoryService.GetItem(new InventoryItemBase(itemID));
+                if (item != null)
+                {
+                    copyItem = m_Scene.GiveInventoryItem(m_HostCapsObj.AgentID, item.Owner, itemID, folderID);
+                    if (copyItem != null && client != null)
+                    {
+                        m_log.InfoFormat("[CAPS]: CopyInventoryFromNotecard, ItemID:{0}, FolderID:{1}", copyItem.ID, copyItem.Folder);
+                        client.SendBulkUpdateInventory(copyItem);
+                    }
+                }
+                else
+                {
+                    m_log.ErrorFormat("[CAPS]: CopyInventoryFromNotecard - Failed to retrieve item {0} from notecard {1}", itemID, notecardID);
+                    if (client != null)
+                        client.SendAlertMessage("Failed to retrieve item");
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[CAPS]: CopyInventoryFromNotecard : {0}", e.ToString());
+            }
+
+            response["int_response_code"] = 200;
+            return LLSDHelpers.SerialiseLLSDReply(response);
+        }
     }
 
     public class AssetUploader
@@ -1018,4 +1094,4 @@ namespace OpenSim.Region.ClientStack.Linden
             fs.Close();
         }
     }
-}
+}

OpenSim/Region/ClientStack/Linden/Caps/FetchInventory2Module.cs

@@ -0,0 +1,151 @@
+/*
+ * 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.Reflection;
+using log4net;
+using Nini.Config;
+using Mono.Addins;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+using OpenSim.Capabilities.Handlers;
+
+namespace OpenSim.Region.ClientStack.Linden
+{
+    /// <summary>
+    /// This module implements both WebFetchInventoryDescendents and FetchInventoryDescendents2 capabilities.
+    /// </summary>
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class FetchInventory2Module : INonSharedRegionModule
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public bool Enabled { get; private set; }
+
+        private Scene m_scene;
+
+        private IInventoryService m_inventoryService;
+
+        private string m_fetchInventory2Url;
+
+        private FetchInventory2Handler m_fetchHandler;
+
+        #region ISharedRegionModule Members
+
+        public void Initialise(IConfigSource source)
+        {
+            IConfig config = source.Configs["ClientStack.LindenCaps"];
+            if (config == null)
+                return;
+
+            m_fetchInventory2Url = config.GetString("Cap_FetchInventory2", string.Empty);
+
+            if (m_fetchInventory2Url != string.Empty)
+                Enabled = true;
+        }
+
+        public void AddRegion(Scene s)
+        {
+            if (!Enabled)
+                return;
+
+            m_scene = s;
+        }
+
+        public void RemoveRegion(Scene s)
+        {
+            if (!Enabled)
+                return;
+
+            m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
+            m_scene = null;
+        }
+
+        public void RegionLoaded(Scene s)
+        {
+            if (!Enabled)
+                return;
+
+            m_inventoryService = m_scene.InventoryService;
+
+            // We'll reuse the same handler for all requests.
+            if (m_fetchInventory2Url == "localhost")
+                m_fetchHandler = new FetchInventory2Handler(m_inventoryService);
+
+            m_scene.EventManager.OnRegisterCaps += RegisterCaps;
+        }
+
+        public void PostInitialise() {}
+
+        public void Close() {}
+
+        public string Name { get { return "FetchInventory2Module"; } }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        #endregion
+
+        private void RegisterCaps(UUID agentID, Caps caps)
+        {
+            RegisterFetchCap(agentID, caps, "FetchInventory2", m_fetchInventory2Url);
+        }
+
+        private void RegisterFetchCap(UUID agentID, Caps caps, string capName, string url)
+        {
+            string capUrl;
+
+            if (url == "localhost")
+            {
+                capUrl = "/CAPS/" + UUID.Random();
+
+                IRequestHandler reqHandler
+                    = new RestStreamHandler("POST", capUrl, m_fetchHandler.FetchInventoryRequest);
+
+                caps.RegisterHandler(capName, reqHandler);
+            }
+            else
+            {
+                capUrl = url;
+
+                caps.RegisterHandler(capName, capUrl);
+            }
+
+//            m_log.DebugFormat(
+//                "[FETCH INVENTORY2 MODULE]: Registered capability {0} at {1} in region {2} for {3}",
+//                capName, capUrl, m_scene.RegionInfo.RegionName, agentID);
+        }
+    }
+}

OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs

@@ -50,8 +50,7 @@ namespace OpenSim.Region.ClientStack.Linden
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
     public class NewFileAgentInventoryVariablePriceModule : INonSharedRegionModule
     {
-//        private static readonly ILog m_log =
-//            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         private Scene m_scene;
 //        private IAssetService m_assetService;
@@ -147,7 +146,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 {
                     if (m_scene.TryGetClient(agentID, out client))
                     {
-                        if (!mm.UploadCovered(client, mm.UploadCharge))
+                        if (!mm.UploadCovered(client.AgentId, mm.UploadCharge))
                         {
                             if (client != null)
                                 client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
@@ -210,6 +209,9 @@ namespace OpenSim.Region.ClientStack.Linden
                                           UUID inventoryItem, UUID parentFolder, byte[] data, string inventoryType,
                                           string assetType,UUID AgentID)
         {
+//            m_log.DebugFormat(
+//                "[NEW FILE AGENT INVENTORY VARIABLE PRICE MODULE]: Upload complete for {0}", inventoryItem);
+
             sbyte assType = 0;
             sbyte inType = 0;
 
@@ -259,13 +261,13 @@ namespace OpenSim.Region.ClientStack.Linden
             item.AssetType = assType;
             item.InvType = inType;
             item.Folder = parentFolder;
-            item.CurrentPermissions = (uint)PermissionMask.All;
+            item.CurrentPermissions
+                = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer);
             item.BasePermissions = (uint)PermissionMask.All;
             item.EveryOnePermissions = 0;
             item.NextPermissions = (uint)PermissionMask.All;
             item.CreationDate = Util.UnixTimeSinceEpoch();
             m_scene.AddInventoryItem(item);
-            
         }
     }
-}
+}

OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs

@@ -339,7 +339,7 @@ namespace OpenSim.Region.ClientStack.Linden
                     m_scene.AddSceneObject(grp);
                     grp.AbsolutePosition = obj.Position;
                 }
-
+                
                 allparts[i] = grp;
             }
 

OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs

@@ -45,6 +45,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private const int IMAGE_PACKET_SIZE = 1000;
         private const int FIRST_PACKET_SIZE = 600;
 
+        /// <summary>
+        /// If we've requested an asset but not received it in this ticks timeframe, then allow a duplicate
+        /// request from the client to trigger a fresh asset request.
+        /// </summary>
+        /// <remarks>
+        /// There are 10,000 ticks in a millisecond
+        /// </remarks>
+        private const int ASSET_REQUEST_TIMEOUT = 100000000;
+
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public uint LastSequence;
@@ -56,9 +65,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public IAssetService AssetService;
         public UUID AgentID;
         public IInventoryAccessModule InventoryAccessModule;
-        public OpenJPEG.J2KLayerInfo[] Layers;
-        public bool IsDecoded;
-        public bool HasAsset;
+        private OpenJPEG.J2KLayerInfo[] m_layers;
+
+        /// <summary>
+        /// Has this request decoded the asset data?
+        /// </summary>
+        public bool IsDecoded { get; private set; }
+
+        /// <summary>
+        /// Has this request received the required asset data?
+        /// </summary>
+        public bool HasAsset { get; private set; }
+
+        /// <summary>
+        /// Time in milliseconds at which the asset was requested.
+        /// </summary>
+        public long AssetRequestTime { get; private set; }
+
         public C5.IPriorityQueueHandle<J2KImage> PriorityQueueHandle;
 
         private uint m_currentPacket;
@@ -82,7 +105,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="packetsToSend">Maximum number of packets to send during this call</param>
         /// <param name="packetsSent">Number of packets sent during this call</param>
         /// <returns>True if the transfer completes at the current discard level, otherwise false</returns>
-        public bool SendPackets(LLClientView client, int packetsToSend, out int packetsSent)
+        public bool SendPackets(IClientAPI client, int packetsToSend, out int packetsSent)
         {
             packetsSent = 0;
 
@@ -102,7 +125,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 {
                     m_currentPacket = 2;
                 }
-                
+
                 while (sendMore && packetsSent < packetsToSend && m_currentPacket <= m_stopPacket)
                 {
                     sendMore = SendPacket(client);
@@ -114,17 +137,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             return (m_currentPacket > m_stopPacket);
         }
 
+        /// <summary>
+        /// This is where we decide what we need to update
+        /// and assign the real discardLevel and packetNumber
+        /// assuming of course that the connected client might be bonkers
+        /// </summary>
         public void RunUpdate()
         {
-            //This is where we decide what we need to update
-            //and assign the real discardLevel and packetNumber
-            //assuming of course that the connected client might be bonkers
-
             if (!HasAsset)
             {
-                if (!m_assetRequested)
+                if (!m_assetRequested || DateTime.UtcNow.Ticks > AssetRequestTime + ASSET_REQUEST_TIMEOUT)
                 {
+//                    m_log.DebugFormat(
+//                        "[J2KIMAGE]: Requesting asset {0} from request in packet {1}, already requested? {2}, due to timeout? {3}",
+//                        TextureID, LastSequence, m_assetRequested, DateTime.UtcNow.Ticks > AssetRequestTime + ASSET_REQUEST_TIMEOUT);
+
                     m_assetRequested = true;
+                    AssetRequestTime = DateTime.UtcNow.Ticks;
+
                     AssetService.Get(TextureID.ToString(), this, AssetReceived);
                 }
             }
@@ -137,6 +167,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     {
                         //Request decode
                         m_decodeRequested = true;
+
+//                        m_log.DebugFormat("[J2KIMAGE]: Requesting decode of asset {0}", TextureID);
+
                         // Do we have a jpeg decoder?
                         if (J2KDecoder != null)
                         {
@@ -149,7 +182,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                 // Send it off to the jpeg decoder
                                 J2KDecoder.BeginDecode(TextureID, m_asset, J2KDecodedCallback);
                             }
-
                         }
                         else
                         {
@@ -170,14 +202,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     if (DiscardLevel >= 0 || m_stopPacket == 0)
                     {
                         // This shouldn't happen, but if it does, we really can't proceed
-                        if (Layers == null)
+                        if (m_layers == null)
                         {
                             m_log.Warn("[J2KIMAGE]: RunUpdate() called with missing Layers. Canceling texture transfer");
                             m_currentPacket = m_stopPacket;
                             return;
                         }
 
-                        int maxDiscardLevel = Math.Max(0, Layers.Length - 1);
+                        int maxDiscardLevel = Math.Max(0, m_layers.Length - 1);
 
                         // Treat initial texture downloads with a DiscardLevel of -1 a request for the highest DiscardLevel
                         if (DiscardLevel < 0 && m_stopPacket == 0)
@@ -187,9 +219,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         DiscardLevel = (sbyte)Math.Min(DiscardLevel, maxDiscardLevel);
 
                         //Calculate the m_stopPacket
-                        if (Layers.Length > 0)
+                        if (m_layers.Length > 0)
                         {
-                            m_stopPacket = (uint)GetPacketForBytePosition(Layers[(Layers.Length - 1) - DiscardLevel].End);
+                            m_stopPacket = (uint)GetPacketForBytePosition(m_layers[(m_layers.Length - 1) - DiscardLevel].End);
                             //I don't know why, but the viewer seems to expect the final packet if the file
                             //is just one packet bigger.
                             if (TexturePacketCount() == m_stopPacket + 1)
@@ -203,7 +235,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         }
 
                         //Give them at least two packets, to play nice with some broken viewers (SL also behaves this way)
-                        if (m_stopPacket == 1 && Layers[0].End > FIRST_PACKET_SIZE) m_stopPacket++;
+                        if (m_stopPacket == 1 && m_layers[0].End > FIRST_PACKET_SIZE) m_stopPacket++;
 
                         m_currentPacket = StartPacket;
                     }
@@ -211,7 +243,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
 
-        private bool SendFirstPacket(LLClientView client)
+        private bool SendFirstPacket(IClientAPI client)
         {
             if (client == null)
                 return false;
@@ -246,7 +278,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             return false;
         }
 
-        private bool SendPacket(LLClientView client)
+        private bool SendPacket(IClientAPI client)
         {
             if (client == null)
                 return false;
@@ -331,20 +363,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             if (m_currentPacket == 0)
                 return 0;
+
             if (m_currentPacket == 1)
                 return FIRST_PACKET_SIZE;
 
             int result = FIRST_PACKET_SIZE + ((int)m_currentPacket - 2) * IMAGE_PACKET_SIZE;
+
             if (result < 0)
-            {
                 result = FIRST_PACKET_SIZE;
-            }
+
             return result;
         }
 
         private void J2KDecodedCallback(UUID AssetId, OpenJPEG.J2KLayerInfo[] layers)
         {
-            Layers = layers;
+            m_layers = layers;
             IsDecoded = true;
             RunUpdate();
         }
@@ -375,9 +408,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private void AssetReceived(string id, Object sender, AssetBase asset)
         {
+//            m_log.DebugFormat(
+//                "[J2KIMAGE]: Received asset {0} ({1} bytes)", id, asset != null ? asset.Data.Length.ToString() : "n/a");
+
             UUID assetID = UUID.Zero;
             if (asset != null)
+            {
                 assetID = asset.FullID;
+            }
             else if ((InventoryAccessModule != null) && (sender != InventoryAccessModule))
             {
                 // Unfortunately we need this here, there's no other way.
@@ -388,14 +426,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 string assetServerURL = string.Empty;
                 if (InventoryAccessModule.IsForeignUser(AgentID, out assetServerURL))
                 {
-                    m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", id);
-                    AssetService.Get(assetServerURL + "/" + id, InventoryAccessModule, AssetReceived);
+                    if (!assetServerURL.EndsWith("/") && !assetServerURL.EndsWith("="))
+                        assetServerURL = assetServerURL + "/";
+
+                    m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", assetServerURL + id);
+                    AssetService.Get(assetServerURL + id, InventoryAccessModule, AssetReceived);
                     return;
                 }
             }
 
             AssetDataCallback(assetID, asset);
-
         }
     }
 }

OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs

@@ -220,6 +220,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event BakeTerrain OnBakeTerrain;
         public event RequestTerrain OnUploadTerrain;
         public event EstateChangeInfo OnEstateChangeInfo;
+        public event EstateManageTelehub OnEstateManageTelehub;
         public event EstateRestartSimRequest OnEstateRestartSimRequest;
         public event EstateChangeCovenantRequest OnEstateChangeCovenantRequest;
         public event UpdateEstateAccessDeltaRequest OnUpdateEstateAccessDeltaRequest;
@@ -306,6 +307,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         protected static Dictionary<PacketType, PacketMethod> PacketHandlers = new Dictionary<PacketType, PacketMethod>(); //Global/static handlers for all clients
 
+        /// <summary>
+        /// Handles UDP texture download.
+        /// </summary>
+        public LLImageManager ImageManager { get; private set; }
+
         private readonly LLUDPServer m_udpServer;
         private readonly LLUDPClient m_udpClient;
         private readonly UUID m_sessionId;
@@ -351,7 +357,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         protected Dictionary<PacketType, PacketProcessor> m_packetHandlers = new Dictionary<PacketType, PacketProcessor>();
         protected Dictionary<string, GenericMessage> m_genericPacketHandlers = new Dictionary<string, GenericMessage>(); //PauPaw:Local Generic Message handlers
         protected Scene m_scene;
-        protected LLImageManager m_imageManager;
         protected string m_firstName;
         protected string m_lastName;
         protected Thread m_clientThread;
@@ -452,6 +457,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public LLClientView(EndPoint remoteEP, Scene scene, LLUDPServer udpServer, LLUDPClient udpClient, AuthenticateResponse sessionInfo,
             UUID agentId, UUID sessionId, uint circuitCode)
         {
+//            DebugPacketLevel = 1;
+
             RegisterInterface<IClientIM>(this);
             RegisterInterface<IClientChat>(this);
             RegisterInterface<IClientIPEndpoint>(this);
@@ -468,7 +475,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             m_assetService = m_scene.RequestModuleInterface<IAssetService>();
             m_GroupsModule = scene.RequestModuleInterface<IGroupsModule>();
-            m_imageManager = new LLImageManager(this, m_assetService, Scene.RequestModuleInterface<IJ2KDecoder>());
+            ImageManager = new LLImageManager(this, m_assetService, Scene.RequestModuleInterface<IJ2KDecoder>());
             m_channelVersion = Util.StringToBytes256(scene.GetSimulatorVersion());
             m_agentId = agentId;
             m_sessionId = sessionId;
@@ -520,8 +527,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             IsActive = false;
 
             // Shutdown the image manager
-            if (m_imageManager != null)
-                m_imageManager.Close();
+            ImageManager.Close();
 
             // Fire the callback for this connection closing
             if (OnConnectionClosed != null)
@@ -598,8 +604,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <summary>
         /// Add a handler for the given packet type.
         /// </summary>
-        /// <remarks>The packet is handled on its own thread.  If packets must be handled in the order in which thye
-        /// are received then please us ethe synchronous version of this method.</remarks>
+        /// <remarks>
+        /// The packet is handled on its own thread.  If packets must be handled in the order in which they
+        /// are received then please use the synchronous version of this method.
+        /// </remarks>
         /// <param name="packetType"></param>
         /// <param name="handler"></param>
         /// <returns>true if the handler was added.  This is currently always the case.</returns>
@@ -778,9 +786,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OutPacket(handshake, ThrottleOutPacketType.Task);
         }
 
-        /// <summary>
-        ///
-        /// </summary>
         public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look)
         {
             AgentMovementCompletePacket mov = (AgentMovementCompletePacket)PacketPool.Instance.GetPacket(PacketType.AgentMovementComplete);
@@ -2761,7 +2766,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             reply.Data.ParcelID = parcelID;
             reply.Data.OwnerID = land.OwnerID;
             reply.Data.Name = Utils.StringToBytes(land.Name);
-            reply.Data.Desc = Utils.StringToBytes(land.Description);
+            if (land != null && land.Description != null && land.Description != String.Empty)
+                reply.Data.Desc = Utils.StringToBytes(land.Description.Substring(0, land.Description.Length > 254 ? 254: land.Description.Length));
+            else
+                reply.Data.Desc = new Byte[0];
             reply.Data.ActualArea = land.Area;
             reply.Data.BillableArea = land.Area; // TODO: what is this?
 
@@ -3490,6 +3498,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry)
         {
+//            m_log.DebugFormat(
+//                "[LLCLIENTVIEW]: Sending avatar appearance for {0} with {1} bytes to {2} {3}",
+//                agentID, textureEntry.Length, Name, AgentId);
+
             AvatarAppearancePacket avp = (AvatarAppearancePacket)PacketPool.Instance.GetPacket(PacketType.AvatarAppearance);
             // TODO: don't create new blocks if recycling an old packet
             avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218];
@@ -3511,7 +3523,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public void SendAnimations(UUID[] animations, int[] seqs, UUID sourceAgentId, UUID[] objectIDs)
         {
-            //m_log.DebugFormat("[CLIENT]: Sending animations to {0}", Name);
+//            m_log.DebugFormat("[LLCLIENTVIEW]: Sending animations for {0} to {1}", sourceAgentId, Name);
 
             AvatarAnimationPacket ani = (AvatarAnimationPacket)PacketPool.Instance.GetPacket(PacketType.AvatarAnimation);
             // TODO: don't create new blocks if recycling an old packet
@@ -3546,6 +3558,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// </summary>
         public void SendAvatarDataImmediate(ISceneEntity avatar)
         {
+//            m_log.DebugFormat(
+//                "[LLCLIENTVIEW]: Sending immediate object update for avatar {0} {1} to {2} {3}",
+//                avatar.Name, avatar.UUID, Name, AgentId);
+            
             ScenePresence presence = avatar as ScenePresence;
             if (presence == null)
                 return;
@@ -3555,7 +3571,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             objupdate.RegionData.RegionHandle = presence.RegionHandle;
             objupdate.RegionData.TimeDilation = ushort.MaxValue;
-
+            
             objupdate.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
             objupdate.ObjectData[0] = CreateAvatarUpdateBlock(presence);
 
@@ -3980,15 +3996,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
 
             if ((categories & ThrottleOutPacketTypeFlags.Texture) != 0)
-            {
-                ProcessTextureRequests();
-            }
-        }
-
-        void ProcessTextureRequests()
-        {
-            if (m_imageManager != null)
-                m_imageManager.ProcessImageQueue(m_udpServer.TextureSendLimit);
+                ImageManager.ProcessImageQueue(m_udpServer.TextureSendLimit);
         }
 
         public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID)
@@ -4489,7 +4497,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             EstateCovenantReplyPacket einfopack = new EstateCovenantReplyPacket();
             EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock();
             edata.CovenantID = covenant;
-            edata.CovenantTimestamp = 0;
+            edata.CovenantTimestamp = (uint) m_scene.RegionInfo.RegionSettings.CovenantChangedDateTime;
             edata.EstateOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
             edata.EstateName = Utils.StringToBytes(m_scene.RegionInfo.EstateSettings.EstateName);
             einfopack.Data = edata;
@@ -4497,8 +4505,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         }
 
         public void SendDetailedEstateData(
-            UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, 
-            UUID covenant, string abuseEmail, UUID estateOwner)
+            UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition,
+            UUID covenant, uint covenantChanged, string abuseEmail, UUID estateOwner)
         {
 //            m_log.DebugFormat(
 //                "[LLCLIENTVIEW]: Sending detailed estate data to {0} with covenant asset id {1}", Name, covenant);
@@ -4523,7 +4531,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             returnblock[4].Parameter = Utils.StringToBytes(sunPosition.ToString());
             returnblock[5].Parameter = Utils.StringToBytes(parentEstate.ToString());
             returnblock[6].Parameter = Utils.StringToBytes(covenant.ToString());
-            returnblock[7].Parameter = Utils.StringToBytes("1160895077"); // what is this?
+            returnblock[7].Parameter = Utils.StringToBytes(covenantChanged.ToString());
             returnblock[8].Parameter = Utils.StringToBytes("1"); // what is this?
             returnblock[9].Parameter = Utils.StringToBytes(abuseEmail);
 
@@ -4533,6 +4541,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OutPacket(packet, ThrottleOutPacketType.Task);
         }
 
+        public void SendTelehubInfo(UUID ObjectID, string ObjectName, Vector3 ObjectPos, Quaternion ObjectRot, List<Vector3> SpawnPoint)
+        {
+            TelehubInfoPacket packet = (TelehubInfoPacket)PacketPool.Instance.GetPacket(PacketType.TelehubInfo);
+            packet.TelehubBlock.ObjectID = ObjectID;
+            packet.TelehubBlock.ObjectName = Utils.StringToBytes(ObjectName);
+            packet.TelehubBlock.TelehubPos = ObjectPos;
+            packet.TelehubBlock.TelehubRot = ObjectRot;
+
+            packet.SpawnPointBlock = new TelehubInfoPacket.SpawnPointBlockBlock[SpawnPoint.Count];
+            for (int n = 0; n < SpawnPoint.Count; n++)
+            {
+                packet.SpawnPointBlock[n] = new TelehubInfoPacket.SpawnPointBlockBlock{SpawnPointPos = SpawnPoint[n]};
+            }
+
+            OutPacket(packet, ThrottleOutPacketType.Task);
+        }
+
         #endregion
 
         #region Land Data Sending Methods
@@ -4608,7 +4633,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             
             if (landData.SimwideArea > 0)
             {
-                int simulatorCapacity = (int)((double)(landData.SimwideArea * m_scene.RegionInfo.ObjectCapacity) * m_scene.RegionInfo.RegionSettings.ObjectBonus) / 65536;
+                int simulatorCapacity = (int)((long)landData.SimwideArea * (long)m_scene.RegionInfo.ObjectCapacity * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus / 65536L);
                 // Never report more than sim total capacity
                 if (simulatorCapacity > m_scene.RegionInfo.ObjectCapacity)
                     simulatorCapacity = m_scene.RegionInfo.ObjectCapacity;
@@ -4659,7 +4684,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
 
-        public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID)
+        public void SendLandAccessListData(List<LandAccessEntry> accessList, uint accessFlag, int localLandID)
         {
             ParcelAccessListReplyPacket replyPacket = (ParcelAccessListReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelAccessListReply);
             replyPacket.Data.AgentID = AgentId;
@@ -4668,12 +4693,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             replyPacket.Data.SequenceID = 0;
 
             List<ParcelAccessListReplyPacket.ListBlock> list = new List<ParcelAccessListReplyPacket.ListBlock>();
-            foreach (UUID avatar in avatars)
+            foreach (LandAccessEntry entry in accessList)
             {
                 ParcelAccessListReplyPacket.ListBlock block = new ParcelAccessListReplyPacket.ListBlock();
                 block.Flags = accessFlag;
-                block.ID = avatar;
-                block.Time = 0;
+                block.ID = entry.AgentID;
+                block.Time = entry.Expires;
                 list.Add(block);
             }
 
@@ -4949,8 +4974,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             update.Scale = new Vector3(0.45f, 0.6f, 1.9f);
             update.Text = Utils.EmptyBytes;
             update.TextColor = new byte[4];
+
+            // Don't send texture anim for avatars - this has no meaning for them.
             update.TextureAnim = Utils.EmptyBytes;
-            update.TextureEntry = (data.Appearance.Texture != null) ? data.Appearance.Texture.GetBytes() : Utils.EmptyBytes;
+
+            // Don't send texture entry for avatars here - this is accomplished via the AvatarAppearance packet
+            update.TextureEntry = Utils.EmptyBytes;
+//            update.TextureEntry = (data.Appearance.Texture != null) ? data.Appearance.Texture.GetBytes() : Utils.EmptyBytes;
+
             update.UpdateFlags = (uint)(
                 PrimFlags.Physics | PrimFlags.ObjectModify | PrimFlags.ObjectCopy | PrimFlags.ObjectAnyOwner |
                 PrimFlags.ObjectYouOwner | PrimFlags.ObjectMove | PrimFlags.InventoryEmpty | PrimFlags.ObjectTransfer |
@@ -5137,7 +5168,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             AddLocalPacketHandler(PacketType.ImprovedInstantMessage, HandlerImprovedInstantMessage, false);
             AddLocalPacketHandler(PacketType.AcceptFriendship, HandlerAcceptFriendship);
             AddLocalPacketHandler(PacketType.DeclineFriendship, HandlerDeclineFriendship);
-            AddLocalPacketHandler(PacketType.TerminateFriendship, HandlerTerminateFrendship);
+            AddLocalPacketHandler(PacketType.TerminateFriendship, HandlerTerminateFriendship);
             AddLocalPacketHandler(PacketType.RezObject, HandlerRezObject);
             AddLocalPacketHandler(PacketType.DeRezObject, HandlerDeRezObject);
             AddLocalPacketHandler(PacketType.ModifyLand, HandlerModifyLand);
@@ -5860,7 +5891,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             return true;
         }
 
-        private bool HandlerTerminateFrendship(IClientAPI sender, Packet Pack)
+        private bool HandlerTerminateFriendship(IClientAPI sender, Packet Pack)
         {
             TerminateFriendshipPacket tfriendpack = (TerminateFriendshipPacket)Pack;
 
@@ -5875,13 +5906,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             UUID listOwnerAgentID = tfriendpack.AgentData.AgentID;
             UUID exFriendID = tfriendpack.ExBlock.OtherID;
-
-            FriendshipTermination handlerTerminateFriendship = OnTerminateFriendship;
-            if (handlerTerminateFriendship != null)
+            FriendshipTermination TerminateFriendshipHandler = OnTerminateFriendship;
+            if (TerminateFriendshipHandler != null)
             {
-                handlerTerminateFriendship(this, listOwnerAgentID, exFriendID);
+                TerminateFriendshipHandler(this, listOwnerAgentID, exFriendID);
+                return true;
             }
-            return true;
+            return false;
         }
 
         private bool HandleFindAgent(IClientAPI client, Packet Packet)
@@ -6060,7 +6091,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // for the client session anyway, in order to protect ourselves against bad code in plugins
                 try
                 {
-
                     byte[] visualparams = new byte[appear.VisualParam.Length];
                     for (int i = 0; i < appear.VisualParam.Length; i++)
                         visualparams[i] = appear.VisualParam[i].ParamValue;
@@ -7531,12 +7561,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if ((ImageType)block.Type == ImageType.Baked)
                     args.Priority *= 2.0f;
 
-                // in the end, we null this, so we have to check if it's null
-                if (m_imageManager != null)
-                {
-                    m_imageManager.EnqueueReq(args);
-                }
+                ImageManager.EnqueueReq(args);
             }
+
             return true;
         }
 
@@ -7662,6 +7689,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     }
                 }
             }
+            else
+                if (transfer.TransferInfo.SourceType == (int)SourceType.SimEstate)
+                {
+                    //TransferRequestPacket does not include covenant uuid?
+                    //get scene covenant uuid
+                    taskID = m_scene.RegionInfo.RegionSettings.Covenant;
+                }
 
             MakeAssetRequest(transfer, taskID);
 
@@ -8614,13 +8648,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
             #endregion
 
-            List<ParcelManager.ParcelAccessEntry> entries = new List<ParcelManager.ParcelAccessEntry>();
+            List<LandAccessEntry> entries = new List<LandAccessEntry>();
             foreach (ParcelAccessListUpdatePacket.ListBlock block in updatePacket.List)
             {
-                ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
+                LandAccessEntry entry = new LandAccessEntry();
                 entry.AgentID = block.ID;
                 entry.Flags = (AccessList)block.Flags;
-                entry.Time = Util.ToDateTime(block.Time);
+                entry.Expires = block.Time;
                 entries.Add(entry);
             }
 
@@ -8975,7 +9009,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private bool HandleEstateOwnerMessage(IClientAPI sender, Packet Pack)
         {
             EstateOwnerMessagePacket messagePacket = (EstateOwnerMessagePacket)Pack;
-            //m_log.Debug(messagePacket.ToString());
+            // m_log.InfoFormat("[LLCLIENTVIEW]: Packet: {0}", Utils.BytesToString(messagePacket.MethodData.Method));
             GodLandStatRequest handlerLandStatRequest;
 
             #region Packet Session and User Check
@@ -9274,6 +9308,34 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     }
                     return true;
 
+                case "telehub":
+                    if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false))
+                    {
+                        UUID invoice = messagePacket.MethodData.Invoice;
+                        UUID SenderID = messagePacket.AgentData.AgentID;
+                        UInt32 param1 = 0u;
+
+                        string command = (string)Utils.BytesToString(messagePacket.ParamList[0].Parameter);
+
+                        if (command != "info ui")
+                        {
+                            try
+                            {
+                                param1 = Convert.ToUInt32(Utils.BytesToString(messagePacket.ParamList[1].Parameter));
+                            }
+                            catch
+                            {
+                            }
+                        }
+
+                        EstateManageTelehub handlerEstateManageTelehub = OnEstateManageTelehub;
+                        if (handlerEstateManageTelehub != null)
+                        {
+                            handlerEstateManageTelehub(this, invoice, SenderID, command, param1);
+                        }
+                    }
+                    return true;
+
                 default:
                     m_log.Error("EstateOwnerMessage: Unknown method requested\n" + messagePacket);
                     return true;
@@ -9285,8 +9347,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             //lsrp.RequestData.ReportType; // 1 = colliders, 0 = scripts
             //lsrp.RequestData.RequestFlags;
             //lsrp.RequestData.Filter;
-
-//            return true;
         }
 
         private bool HandleRequestRegionInfo(IClientAPI sender, Packet Pack)
@@ -10462,6 +10522,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
             return true;
         }
+
         private bool HandleGroupRoleMembersRequest(IClientAPI sender, Packet Pack)
         {
             GroupRoleMembersRequestPacket groupRoleMembersRequest =
@@ -11341,9 +11402,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <summary>
         /// Send a response back to a client when it asks the asset server (via the region server) if it has
         /// its appearance texture cached.
-        ///
-        /// At the moment, we always reply that there is no cached texture.
         /// </summary>
+        /// <remarks>
+        /// At the moment, we always reply that there is no cached texture.
+        /// </remarks>
         /// <param name="simclient"></param>
         /// <param name="packet"></param>
         /// <returns></returns>
@@ -11353,7 +11415,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet;
             AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse);
 
-            if (cachedtex.AgentData.SessionID != SessionId) return false;
+            if (cachedtex.AgentData.SessionID != SessionId)
+                return false;
 
             // TODO: don't create new blocks if recycling an old packet
             cachedresp.AgentData.AgentID = AgentId;
@@ -11751,6 +11814,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if (DebugPacketLevel <= 50 && packet.Type == PacketType.ImprovedTerseObjectUpdate)
                     logPacket = false;
 
+                if (DebugPacketLevel <= 25 && packet.Type == PacketType.ObjectPropertiesFamily)
+                    logPacket = false;
+
                 if (logPacket)
                     m_log.DebugFormat(
                         "[CLIENT]: PACKET OUT to   {0} ({1}) in {2} - {3}",
@@ -11808,6 +11874,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if (DebugPacketLevel <= 100 && (packet.Type == PacketType.ViewerEffect || packet.Type == PacketType.AgentAnimation))
                     logPacket = false;
 
+                if (DebugPacketLevel <= 25 && packet.Type == PacketType.RequestObjectPropertiesFamily)
+                    logPacket = false;
+
                 if (logPacket)
                     m_log.DebugFormat(
                         "[CLIENT]: PACKET IN  from {0} ({1}) in {2} - {3}",
@@ -12051,6 +12120,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 requestID = new UUID(transferRequest.TransferInfo.Params, 80);
             }
+            else if (transferRequest.TransferInfo.SourceType == (int)SourceType.SimEstate)
+            {
+                requestID = taskID;
+            }
+
 
 //            m_log.DebugFormat("[CLIENT]: {0} requesting asset {1}", Name, requestID);
 

OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs

@@ -39,6 +39,9 @@ using log4net;
 
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
+    /// <summary>
+    /// This class handles UDP texture requests.
+    /// </summary>
     public class LLImageManager
     {
         private sealed class J2KImageComparer : IComparer<J2KImage>
@@ -52,18 +55,29 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private bool m_shuttingdown;
         private AssetBase m_missingImage;
-        private LLClientView m_client; //Client we're assigned to
-        private IAssetService m_assetCache; //Asset Cache
-        private IJ2KDecoder m_j2kDecodeModule; //Our J2K module
+        private IAssetService m_assetCache;
+        private IJ2KDecoder m_j2kDecodeModule;
+
+        /// <summary>
+        /// Priority queue for determining which image to send first.
+        /// </summary>
         private C5.IntervalHeap<J2KImage> m_priorityQueue = new C5.IntervalHeap<J2KImage>(10, new J2KImageComparer());
+
+        /// <summary>
+        /// Used to control thread access to the priority queue.
+        /// </summary>
         private object m_syncRoot = new object();
 
-        public LLClientView Client { get { return m_client; } }
+        /// <summary>
+        /// Client served by this image manager
+        /// </summary>
+        public IClientAPI Client { get; private set; }
+
         public AssetBase MissingImage { get { return m_missingImage; } }
 
-        public LLImageManager(LLClientView client, IAssetService pAssetCache, IJ2KDecoder pJ2kDecodeModule)
+        public LLImageManager(IClientAPI client, IAssetService pAssetCache, IJ2KDecoder pJ2kDecodeModule)
         {
-            m_client = client;
+            Client = client;
             m_assetCache = pAssetCache;
 
             if (pAssetCache != null)
@@ -81,7 +95,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="newRequest"></param>
         public void EnqueueReq(TextureRequestArgs newRequest)
         {
-            //Make sure we're not shutting down..
             if (!m_shuttingdown)
             {
                 J2KImage imgrequest;
@@ -96,19 +109,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     {
                         //m_log.Debug("[TEX]: (CAN) ID=" + newRequest.RequestedAssetID);
 
-                        try 
+                        try
                         {
                             lock (m_syncRoot)
-                                m_priorityQueue.Delete(imgrequest.PriorityQueueHandle); 
+                                m_priorityQueue.Delete(imgrequest.PriorityQueueHandle);
                         }
                         catch (Exception) { }
                     }
                     else
                     {
-                        //m_log.DebugFormat("[TEX]: (UPD) ID={0}: D={1}, S={2}, P={3}",
-                        //    newRequest.RequestedAssetID, newRequest.DiscardLevel, newRequest.PacketNumber, newRequest.Priority);
+//                        m_log.DebugFormat(
+//                            "[LL IMAGE MANAGER]: Received duplicate of existing request for {0}, start packet {1} from {2}",
+//                            newRequest.RequestedAssetID, newRequest.PacketNumber, m_client.Name);
 
-                        //Check the packet sequence to make sure this isn't older than 
+//                        m_log.DebugFormat("[TEX]: (UPD) ID={0}: D={1}, S={2}, P={3}",
+//                            newRequest.RequestedAssetID, newRequest.DiscardLevel, newRequest.PacketNumber, newRequest.Priority);
+
+                        //Check the packet sequence to make sure this isn't older than
                         //one we've already received
                         if (newRequest.requestSequence > imgrequest.LastSequence)
                         {
@@ -123,11 +140,34 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                             //Update the requested priority
                             imgrequest.Priority = newRequest.Priority;
+
                             UpdateImageInQueue(imgrequest);
 
-                            //Run an update
                             imgrequest.RunUpdate();
+
+//                        J2KImage imgrequest2 = new J2KImage(this);
+//                        imgrequest2.J2KDecoder = m_j2kDecodeModule;
+//                        imgrequest2.AssetService = m_assetCache;
+//                        imgrequest2.AgentID = m_client.AgentId;
+//                        imgrequest2.InventoryAccessModule = m_client.Scene.RequestModuleInterface<IInventoryAccessModule>();
+//                        imgrequest2.DiscardLevel = newRequest.DiscardLevel;
+//                        imgrequest2.StartPacket = Math.Max(1, newRequest.PacketNumber);
+//                        imgrequest2.Priority = newRequest.Priority;
+//                        imgrequest2.TextureID = newRequest.RequestedAssetID;
+//                        imgrequest2.Priority = newRequest.Priority;
+//
+//                        //Add this download to the priority queue
+//                        AddImageToQueue(imgrequest2);
+//
+//                        imgrequest2.RunUpdate();
+
                         }
+//                        else
+//                        {
+//                            m_log.DebugFormat(
+//                                "[LL IMAGE MANAGER]: Ignoring duplicate of existing request for {0} (sequence {1}) from {2} as its request sequence {3} is not greater",
+//                                newRequest.RequestedAssetID, imgrequest.LastSequence, m_client.Name, newRequest.requestSequence);
+//                        }
                     }
                 }
                 else
@@ -139,14 +179,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     }
                     else
                     {
+//                        m_log.DebugFormat(
+//                            "[LL IMAGE MANAGER]: Received request for {0}, start packet {1} from {2}",
+//                            newRequest.RequestedAssetID, newRequest.PacketNumber, m_client.Name);
+
                         //m_log.DebugFormat("[TEX]: (NEW) ID={0}: D={1}, S={2}, P={3}",
                         //    newRequest.RequestedAssetID, newRequest.DiscardLevel, newRequest.PacketNumber, newRequest.Priority);
 
                         imgrequest = new J2KImage(this);
                         imgrequest.J2KDecoder = m_j2kDecodeModule;
                         imgrequest.AssetService = m_assetCache;
-                        imgrequest.AgentID = m_client.AgentId;
-                        imgrequest.InventoryAccessModule = m_client.Scene.RequestModuleInterface<IInventoryAccessModule>();
+                        imgrequest.AgentID = Client.AgentId;
+                        imgrequest.InventoryAccessModule = Client.Scene.RequestModuleInterface<IInventoryAccessModule>();
                         imgrequest.DiscardLevel = newRequest.DiscardLevel;
                         imgrequest.StartPacket = Math.Max(1, newRequest.PacketNumber);
                         imgrequest.Priority = newRequest.Priority;
@@ -156,7 +200,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         //Add this download to the priority queue
                         AddImageToQueue(imgrequest);
 
-                        //Run an update
                         imgrequest.RunUpdate();
                     }
                 }
@@ -173,12 +216,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 // If null was returned, the texture priority queue is currently empty
                 if (image == null)
-                    return false;
+                    break;
 
                 if (image.IsDecoded)
                 {
                     int sent;
-                    bool imageDone = image.SendPackets(m_client, packetsToSend - packetsSent, out sent);
+                    bool imageDone = image.SendPackets(Client, packetsToSend - packetsSent, out sent);
                     packetsSent += sent;
 
                     // If the send is complete, destroy any knowledge of this transfer
@@ -191,10 +234,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     // written. Undecoded textures should not be going into the priority
                     // queue, because a high priority undecoded texture will clog up the
                     // pipeline for a client
-                    return true;
+//                    m_log.DebugFormat(
+//                        "[LL IMAGE MANAGER]: Exiting image queue processing early on encountering undecoded image {0}",
+//                        image.TextureID);
+
+                    break;
                 }
             }
 
+//            if (packetsSent != 0)
+//                m_log.DebugFormat("[LL IMAGE MANAGER]: Processed {0} packets from image queue", packetsSent);
+
             return m_priorityQueue.Count > 0;
         }
 
@@ -206,9 +256,39 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_shuttingdown = true;
         }
 
+        /// <summary>
+        /// Clear the image queue.
+        /// </summary>
+        /// <returns>The number of requests cleared.</returns>
+        public int ClearImageQueue()
+        {
+            int requestsDeleted;
+
+            lock (m_priorityQueue)
+            {
+                requestsDeleted = m_priorityQueue.Count;
+
+                // Surprisingly, there doesn't seem to be a clear method at this time.
+                while (!m_priorityQueue.IsEmpty)
+                    m_priorityQueue.DeleteMax();
+            }
+
+            return requestsDeleted;
+        }
+
+        /// <summary>
+        /// Returns an array containing all the images in the queue.
+        /// </summary>
+        /// <returns></returns>
+        public J2KImage[] GetImages()
+        {
+            lock (m_priorityQueue)
+                return m_priorityQueue.ToArray();
+        }
+
         #region Priority Queue Helpers
 
-        J2KImage GetHighestPriorityImage()
+        private J2KImage GetHighestPriorityImage()
         {
             J2KImage image = null;
 
@@ -216,34 +296,50 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 if (m_priorityQueue.Count > 0)
                 {
-                    try { image = m_priorityQueue.FindMax(); }
+                    try
+                    {
+                        image = m_priorityQueue.FindMax();
+                    }
                     catch (Exception) { }
                 }
             }
             return image;
         }
 
-        void AddImageToQueue(J2KImage image)
+        private void AddImageToQueue(J2KImage image)
         {
             image.PriorityQueueHandle = null;
 
             lock (m_syncRoot)
-                try { m_priorityQueue.Add(ref image.PriorityQueueHandle, image); }
+            {
+                try
+                {
+                    m_priorityQueue.Add(ref image.PriorityQueueHandle, image);
+                }
                 catch (Exception) { }
+            }
         }
 
-        void RemoveImageFromQueue(J2KImage image)
-        {
-            lock (m_syncRoot)
-                try { m_priorityQueue.Delete(image.PriorityQueueHandle); }
-                catch (Exception) { }
-        }
-
-        void UpdateImageInQueue(J2KImage image)
+        private void RemoveImageFromQueue(J2KImage image)
         {
             lock (m_syncRoot)
             {
-                try { m_priorityQueue.Replace(image.PriorityQueueHandle, image); }
+                try
+                {
+                    m_priorityQueue.Delete(image.PriorityQueueHandle);
+                }
+                catch (Exception) { }
+            }
+        }
+
+        private void UpdateImageInQueue(J2KImage image)
+        {
+            lock (m_syncRoot)
+            {
+                try
+                {
+                    m_priorityQueue.Replace(image.PriorityQueueHandle, image);
+                }
                 catch (Exception)
                 {
                     image.PriorityQueueHandle = null;
@@ -254,4 +350,4 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         #endregion Priority Queue Helpers
     }
-}
+}

OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs

@@ -492,6 +492,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if ((Environment.TickCount & Int32.MaxValue) - udpClient.TickLastPacketReceived > 1000 * 60)
             {
                 m_log.Warn("[LLUDPSERVER]: Ack timeout, disconnecting " + udpClient.AgentID);
+                StatsManager.SimExtraStats.AddAbnormalClientThreadTermination();
 
                 RemoveClient(udpClient);
                 return;

OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs

@@ -0,0 +1,160 @@
+/*
+ * 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.IO;
+using System.Net;
+using System.Reflection;
+using log4net.Config;
+using Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenMetaverse.Packets;
+using OpenSim.Framework;
+using OpenSim.Region.CoreModules.Agent.TextureSender;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;
+
+namespace OpenSim.Region.ClientStack.LindenUDP.Tests
+{
+    [TestFixture]
+    public class LLImageManagerTests
+    {
+        private AssetBase m_testImageAsset;
+        private Scene scene;
+        private LLImageManager llim;
+        private TestClient tc;
+
+        [TestFixtureSetUp]
+        public void FixtureInit()
+        {
+            using (
+                Stream resource
+                    = GetType().Assembly.GetManifestResourceStream(
+                        "OpenSim.Region.ClientStack.LindenUDP.Tests.Resources.4-tile2.jp2"))
+            {
+                using (BinaryReader br = new BinaryReader(resource))
+                {
+                    m_testImageAsset
+                        = new AssetBase(
+                            TestHelpers.ParseTail(0x1),
+                            "Test Image",
+                            (sbyte)AssetType.Texture,
+                            TestHelpers.ParseTail(0x2).ToString());
+
+                    m_testImageAsset.Data = br.ReadBytes(99999999);
+                }
+            }
+        }
+
+        [SetUp]
+        public void SetUp()
+        {
+            UUID userId = TestHelpers.ParseTail(0x3);
+
+            J2KDecoderModule j2kdm = new J2KDecoderModule();
+
+            scene = SceneHelpers.SetupScene();
+            SceneHelpers.SetupSceneModules(scene, j2kdm);
+
+            tc = new TestClient(SceneHelpers.GenerateAgentData(userId), scene);
+            llim = new LLImageManager(tc, scene.AssetService, j2kdm);
+        }
+
+        [Test]
+        public void TestSendImage()
+        {
+            TestHelpers.InMethod();
+//            XmlConfigurator.Configure();
+
+            scene.AssetService.Store(m_testImageAsset);
+
+            TextureRequestArgs args = new TextureRequestArgs();
+            args.RequestedAssetID = m_testImageAsset.FullID;
+            args.DiscardLevel = 0;
+            args.PacketNumber = 1;
+            args.Priority = 5;
+            args.requestSequence = 1;
+
+            llim.EnqueueReq(args);
+            llim.ProcessImageQueue(20);
+
+            Assert.That(tc.SentImageDataPackets.Count, Is.EqualTo(1));
+        }
+
+        [Test]
+        public void TestDiscardImage()
+        {
+            TestHelpers.InMethod();
+//            XmlConfigurator.Configure();
+
+            scene.AssetService.Store(m_testImageAsset);
+
+            TextureRequestArgs args = new TextureRequestArgs();
+            args.RequestedAssetID = m_testImageAsset.FullID;
+            args.DiscardLevel = 0;
+            args.PacketNumber = 1;
+            args.Priority = 5;
+            args.requestSequence = 1;
+            llim.EnqueueReq(args);
+
+            // Now create a discard request
+            TextureRequestArgs discardArgs = new TextureRequestArgs();
+            discardArgs.RequestedAssetID = m_testImageAsset.FullID;
+            discardArgs.DiscardLevel = -1;
+            discardArgs.PacketNumber = 1;
+            discardArgs.Priority = 0;
+            discardArgs.requestSequence = 2;
+            llim.EnqueueReq(discardArgs);
+
+            llim.ProcessImageQueue(20);
+
+            Assert.That(tc.SentImageDataPackets.Count, Is.EqualTo(0));
+        }
+
+        [Test]
+        public void TestMissingImage()
+        {
+            TestHelpers.InMethod();
+//            XmlConfigurator.Configure();
+
+            TextureRequestArgs args = new TextureRequestArgs();
+            args.RequestedAssetID = m_testImageAsset.FullID;
+            args.DiscardLevel = 0;
+            args.PacketNumber = 1;
+            args.Priority = 5;
+            args.requestSequence = 1;
+
+            llim.EnqueueReq(args);
+            llim.ProcessImageQueue(20);
+
+            Assert.That(tc.SentImageDataPackets.Count, Is.EqualTo(0));
+            Assert.That(tc.SentImageNotInDatabasePackets.Count, Is.EqualTo(1));
+        }
+    }
+}

OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs

@@ -246,7 +246,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 
                 if (mm != null)
                 {
-                    if (!mm.UploadCovered(remoteClient, mm.UploadCharge))
+                    if (!mm.UploadCovered(remoteClient.AgentId, mm.UploadCharge))
                     {
                         remoteClient.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
                         return;

OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs

@@ -103,6 +103,10 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
             // If it's cached, return the cached results
             if (m_decodedCache.TryGetValue(assetID, out result))
             {
+//                m_log.DebugFormat(
+//                    "[J2KDecoderModule]: Returning existing cached {0} layers j2k decode for {1}",
+//                    result.Length, assetID);
+
                 callback(assetID, result);
             }
             else
@@ -129,18 +133,20 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
 
                 // Do Decode!
                 if (decode)
-                    DoJ2KDecode(assetID, j2kData);
+                    Decode(assetID, j2kData);
             }
         }
 
-        /// <summary>
-        /// Provides a synchronous decode so that caller can be assured that this executes before the next line
-        /// </summary>
-        /// <param name="assetID"></param>
-        /// <param name="j2kData"></param>
-        public void Decode(UUID assetID, byte[] j2kData)
+        public bool Decode(UUID assetID, byte[] j2kData)
         {
-            DoJ2KDecode(assetID, j2kData);
+            OpenJPEG.J2KLayerInfo[] layers;
+            int components;
+            return Decode(assetID, j2kData, out layers, out components);
+        }
+
+        public bool Decode(UUID assetID, byte[] j2kData, out OpenJPEG.J2KLayerInfo[] layers, out int components)
+        {
+            return DoJ2KDecode(assetID, j2kData, out layers, out components);
         }
 
         #endregion IJ2KDecoder
@@ -150,11 +156,21 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
         /// </summary>
         /// <param name="assetID">UUID of Asset</param>
         /// <param name="j2kData">JPEG2000 data</param>
-        private void DoJ2KDecode(UUID assetID, byte[] j2kData)
+        /// <param name="layers">layer data</param>
+        /// <param name="components">number of components</param>
+        /// <returns>true if decode was successful.  false otherwise.</returns>
+        private bool DoJ2KDecode(UUID assetID, byte[] j2kData, out OpenJPEG.J2KLayerInfo[] layers, out int components)
         {
+//            m_log.DebugFormat(
+//                "[J2KDecoderModule]: Doing J2K decoding of {0} bytes for asset {1}", j2kData.Length, assetID);
+
+            bool decodedSuccessfully = true;
+
             //int DecodeTime = 0;
             //DecodeTime = Environment.TickCount;
-            OpenJPEG.J2KLayerInfo[] layers;
+
+            // We don't get this from CSJ2K.  Is it relevant?
+            components = 0;
 
             if (!TryLoadCacheForAsset(assetID, out layers))
             {
@@ -189,14 +205,15 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
                     catch (Exception ex)
                     {
                         m_log.Warn("[J2KDecoderModule]: CSJ2K threw an exception decoding texture " + assetID + ": " + ex.Message);
+                        decodedSuccessfully = false;
                     }
                 }
                 else
                 {
-                    int components;
                     if (!OpenJPEG.DecodeLayerBoundaries(j2kData, out layers, out components))
                     {
                         m_log.Warn("[J2KDecoderModule]: OpenJPEG failed to decode texture " + assetID);
+                        decodedSuccessfully = false;
                     }
                 }
 
@@ -205,6 +222,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
                     m_log.Warn("[J2KDecoderModule]: Failed to decode layer data for texture " + assetID + ", guessing sane defaults");
                     // Layer decoding completely failed. Guess at sane defaults for the layer boundaries
                     layers = CreateDefaultLayers(j2kData.Length);
+                    decodedSuccessfully = false;
                 }
 
                 // Cache Decoded layers
@@ -224,6 +242,8 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
                     m_notifyList.Remove(assetID);
                 }
             }
+
+            return decodedSuccessfully;
         }
 
         private OpenJPEG.J2KLayerInfo[] CreateDefaultLayers(int j2kLength)

OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs

@@ -39,6 +39,7 @@ using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
+using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.Avatar.Attachments
 {
@@ -116,6 +117,40 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
 //            m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing any attachments for {0}", sp.Name);
 
+            XmlDocument doc = new XmlDocument();
+            string stateData = String.Empty;
+
+            IAttachmentsService attServ = m_scene.RequestModuleInterface<IAttachmentsService>();
+            if (attServ != null)
+            {
+                m_log.DebugFormat("[ATTACHMENT]: Loading attachment data from attachment service");
+                stateData = attServ.Get(sp.UUID.ToString());
+                if (stateData != String.Empty)
+                {
+                    try
+                    {
+                        doc.LoadXml(stateData);
+                    }
+                    catch { }
+                }
+            }
+
+            Dictionary<UUID, string> itemData = new Dictionary<UUID, string>();
+
+            XmlNodeList nodes = doc.GetElementsByTagName("Attachment");
+            if (nodes.Count > 0)
+            {
+                foreach (XmlNode n in nodes)
+                {
+                    XmlElement elem = (XmlElement)n;
+                    string itemID = elem.GetAttribute("ItemID");
+                    string xml = elem.InnerXml;
+
+                    itemData[new UUID(itemID)] = xml;
+                }
+            }
+
+
             List<AvatarAttachment> attachments = sp.Appearance.GetAttachments();
             foreach (AvatarAttachment attach in attachments)
             {
@@ -135,12 +170,22 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
                 try
                 {
+                    string xmlData;
+                    XmlDocument d = null;
+                    UUID asset;
+                    if (itemData.TryGetValue(attach.ItemID, out xmlData))
+                    {
+                        d = new XmlDocument();
+                        d.LoadXml(xmlData);
+                        m_log.InfoFormat("[ATTACHMENT]: Found saved state for item {0}, loading it", attach.ItemID);
+                    }
+
                     // If we're an NPC then skip all the item checks and manipulations since we don't have an
                     // inventory right now.
                     if (sp.PresenceType == PresenceType.Npc)
                         RezSingleAttachmentFromInventoryInternal(sp, UUID.Zero, attach.AssetID, p, null);
                     else
-                        RezSingleAttachmentFromInventory(sp, attach.ItemID, p);
+                        RezSingleAttachmentFromInventory(sp, attach.ItemID, p, true, d);
                 }
                 catch (Exception e)
                 {
@@ -149,7 +194,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             }
         }
 
-        public void SaveChangedAttachments(IScenePresence sp)
+        public void SaveChangedAttachments(IScenePresence sp, bool saveAllScripted)
         {
 //            m_log.DebugFormat("[ATTACHMENTS MODULE]: Saving changed attachments for {0}", sp.Name);
 
@@ -158,13 +203,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             foreach (SceneObjectGroup grp in sp.GetAttachments())
             {
-//                if (grp.HasGroupChanged) // Resizer scripts?
-//                {
-                    grp.IsAttachment = false;
-                    grp.AbsolutePosition = grp.RootPart.AttachedPos;
-                    UpdateKnownItem(sp, grp);
-                    grp.IsAttachment = true;
-//                }
+                grp.IsAttachment = false;
+                grp.AbsolutePosition = grp.RootPart.AttachedPos;
+                UpdateKnownItem(sp, grp, saveAllScripted);
+                grp.IsAttachment = true;
             }
         }
 
@@ -466,9 +508,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         /// </remarks>
         /// <param name="sp"></param>
         /// <param name="grp"></param>
-        private void UpdateKnownItem(IScenePresence sp, SceneObjectGroup grp)
+        private void UpdateKnownItem(IScenePresence sp, SceneObjectGroup grp, bool saveAllScripted)
         {
-            if (grp.HasGroupChanged || grp.ContainsScripts())
+            // Saving attachments for NPCs messes them up for the real owner!
+            INPCModule module = m_scene.RequestModuleInterface<INPCModule>();
+            if (module != null)
+            {
+                if (module.IsNPC(sp.UUID, m_scene))
+                    return;
+            }
+
+            if (grp.HasGroupChanged || (saveAllScripted && grp.ContainsScripts()))
             {
                 m_log.DebugFormat(
                     "[ATTACHMENTS MODULE]: Updating asset for attachment {0}, attachpoint {1}",
@@ -501,6 +551,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     if (sp.ControllingClient != null)
                         sp.ControllingClient.SendInventoryItemCreateUpdate(item, 0);
                 }
+                grp.HasGroupChanged = false; // Prevent it being saved over and over
             }
             else
             {
@@ -694,7 +745,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                             group.IsAttachment = false;
                             group.AbsolutePosition = group.RootPart.AttachedPos;
 
-                            UpdateKnownItem(sp, group);
+                            UpdateKnownItem(sp, group, true);
                             m_scene.DeleteSceneObject(group, false);
 
                             return;

OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs

@@ -26,16 +26,15 @@
  */
 
 using System;
+using System.Collections.Generic;
 using System.Reflection;
+using System.Threading;
+using System.Text;
+using System.Timers;
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
-
-using System.Threading;
-using System.Timers;
-using System.Collections.Generic;
-
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
@@ -45,6 +44,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
     public class AvatarFactoryModule : IAvatarFactoryModule, IRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public const string BAKED_TEXTURES_REPORT_FORMAT = "{0,-9}  {1}";
+
         private Scene m_scene = null;
 
         private int m_savetime = 5; // seconds to wait before saving changed appearance
@@ -147,16 +149,21 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 // Process the baked texture array
                 if (textureEntry != null)
                 {
+                    m_log.InfoFormat("[AVFACTORY]: Received texture update for {0} {1}", sp.Name, sp.UUID);
+
+//                    WriteBakedTexturesReport(sp, m_log.DebugFormat);
+
                     changed = sp.Appearance.SetTextureEntries(textureEntry) || changed;
 
-                    m_log.InfoFormat("[AVFACTORY]: received texture update for {0}", sp.UUID);
-                    Util.FireAndForget(delegate(object o) { ValidateBakedTextureCache(sp, false); });
+//                    WriteBakedTexturesReport(sp, m_log.DebugFormat);
+                    if (!ValidateBakedTextureCache(sp))
+                        RequestRebake(sp, true);
 
                     // This appears to be set only in the final stage of the appearance
                     // update transaction. In theory, we should be able to do an immediate
                     // appearance send and save here.
-
                 }
+                
                 // save only if there were changes, send no matter what (doesn't hurt to send twice)
                 if (changed)
                     QueueAppearanceSave(sp.ControllingClient.AgentId);
@@ -245,18 +252,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         }
 
         /// <summary>
-        /// Check for the existence of the baked texture assets.
-        /// </summary>
-        /// <param name="sp"></param>
-        public bool ValidateBakedTextureCache(IScenePresence sp)
-        {
-            return ValidateBakedTextureCache(sp, true);
-        }
-
-        /// <summary>
-        /// Queue up a request to send appearance, makes it possible to
-        /// accumulate changes without sending out each one separately.
+        /// Queue up a request to send appearance.
         /// </summary>
+        /// <remarks>
+        /// Makes it possible to accumulate changes without sending out each one separately.
+        /// </remarks>
+        /// <param name="agentId"></param>
         public void QueueAppearanceSend(UUID agentid)
         {
 //            m_log.DebugFormat("[AVFACTORY]: Queue appearance send for {0}", agentid);
@@ -283,17 +284,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             }
         }
 
-        #endregion
-
-        #region AvatarFactoryModule private methods
-
-        /// <summary>
-        /// Check for the existence of the baked texture assets. Request a rebake
-        /// unless checkonly is true.
-        /// </summary>
-        /// <param name="client"></param>
-        /// <param name="checkonly"></param>
-        private bool ValidateBakedTextureCache(IScenePresence sp, bool checkonly)
+        public bool ValidateBakedTextureCache(IScenePresence sp)
         {
             bool defonly = true; // are we only using default textures
 
@@ -321,20 +312,66 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 defonly = false; // found a non-default texture reference
 
                 if (m_scene.AssetService.Get(face.TextureID.ToString()) == null)
-                {
-                    if (checkonly)
-                        return false;
-
-                    sp.ControllingClient.SendRebakeAvatarTextures(face.TextureID);
-                }
+                    return false;
             }
 
-            m_log.DebugFormat("[AVFACTORY]: Completed texture check for {0}", sp.UUID);
+            m_log.DebugFormat("[AVFACTORY]: Completed texture check for {0} {1}", sp.Name, sp.UUID);
 
             // If we only found default textures, then the appearance is not cached
             return (defonly ? false : true);
         }
 
+        public int RequestRebake(IScenePresence sp, bool missingTexturesOnly)
+        {
+            int texturesRebaked = 0;
+
+            for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++)
+            {
+                int idx = AvatarAppearance.BAKE_INDICES[i];
+                Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[idx];
+
+                // if there is no texture entry, skip it
+                if (face == null)
+                    continue;
+
+//                m_log.DebugFormat(
+//                    "[AVFACTORY]: Looking for texture {0}, id {1} for {2} {3}",
+//                    face.TextureID, idx, client.Name, client.AgentId);
+
+                // if the texture is one of the "defaults" then skip it
+                // this should probably be more intelligent (skirt texture doesnt matter
+                // if the avatar isnt wearing a skirt) but if any of the main baked
+                // textures is default then the rest should be as well
+                if (face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE)
+                    continue;
+
+                if (missingTexturesOnly)
+                {
+                    if (m_scene.AssetService.Get(face.TextureID.ToString()) != null)
+                        continue;
+                    else
+                        m_log.DebugFormat(
+                            "[AVFACTORY]: Missing baked texture {0} ({1}) for {2}, requesting rebake.",
+                            face.TextureID, idx, sp.Name);
+                }
+                else
+                {
+                    m_log.DebugFormat(
+                        "[AVFACTORY]: Requesting rebake of {0} ({1}) for {2}.",
+                        face.TextureID, idx, sp.Name);
+                }
+
+                texturesRebaked++;
+                sp.ControllingClient.SendRebakeAvatarTextures(face.TextureID);
+            }
+
+            return texturesRebaked;
+        }
+
+        #endregion
+
+        #region AvatarFactoryModule private methods
+
         private Dictionary<BakeType, Primitive.TextureEntryFace> GetBakedTextureFaces(ScenePresence sp)
         {
             if (sp.IsChildAgent)
@@ -404,10 +441,13 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                         m_savequeue.Remove(avatarID);
                     }
                 }
-            }
 
-            if (m_savequeue.Count == 0 && m_sendqueue.Count == 0)
-                m_updateTimer.Stop();
+                // We must lock both queues here so that QueueAppearanceSave() or *Send() don't m_updateTimer.Start() on
+                // another thread inbetween the first count calls and m_updateTimer.Stop() on this thread.
+                lock (m_sendqueue)
+                    if (m_savequeue.Count == 0 && m_sendqueue.Count == 0)
+                        m_updateTimer.Stop();
+            }
         }
 
         private void SaveAppearance(UUID agentid)
@@ -553,5 +593,37 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             }
         }
         #endregion
+
+        public void WriteBakedTexturesReport(IScenePresence sp, ReportOutputAction outputAction)
+        {
+            outputAction("For {0} in {1}", sp.Name, m_scene.RegionInfo.RegionName);
+            outputAction(BAKED_TEXTURES_REPORT_FORMAT, "Bake Type", "UUID");
+
+            Dictionary<BakeType, Primitive.TextureEntryFace> bakedTextures = GetBakedTextureFaces(sp.UUID);
+
+            foreach (BakeType bt in bakedTextures.Keys)
+            {
+                string rawTextureID;
+
+                if (bakedTextures[bt] == null)
+                {
+                    rawTextureID = "not set";
+                }
+                else
+                {
+                    rawTextureID = bakedTextures[bt].TextureID.ToString();
+
+                    if (m_scene.AssetService.Get(rawTextureID) == null)
+                        rawTextureID += " (not found)";
+                    else
+                        rawTextureID += " (uploaded)";
+                }
+
+                outputAction(BAKED_TEXTURES_REPORT_FORMAT, bt, rawTextureID);
+            }
+
+            bool bakedTextureValid = m_scene.AvatarFactory.ValidateBakedTextureCache(sp);
+            outputAction("{0} baked appearance texture is {1}", sp.Name, bakedTextureValid ? "OK" : "corrupt");
+        }
     }
-}
+}

OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs

@@ -50,6 +50,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        IUserManagement m_uMan;
+        IUserManagement UserManagementModule
+        {
+            get
+            {
+                if (m_uMan == null)
+                    m_uMan = m_Scenes[0].RequestModuleInterface<IUserManagement>();
+                return m_uMan;
+            }
+        }
+
         #region ISharedRegionModule
         public override string Name
         {
@@ -369,9 +380,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
         protected override FriendInfo[] GetFriendsFromService(IClientAPI client)
         {
 //            m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetFriendsFromService for {0}", client.Name);
+            Boolean agentIsLocal = true;
+            if (UserManagementModule != null)
+                agentIsLocal = UserManagementModule.IsLocalGridUser(client.AgentId);
 
-            UserAccount account1 = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, client.AgentId);
-            if (account1 != null)
+            if (agentIsLocal)
                 return base.GetFriendsFromService(client);
 
             FriendInfo[] finfos = new FriendInfo[0];
@@ -392,16 +405,22 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         protected override bool StoreRights(UUID agentID, UUID friendID, int rights)
         {
-            UserAccount account1 = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, agentID);
-            UserAccount account2 = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, friendID);
+            Boolean agentIsLocal = true;
+            Boolean friendIsLocal = true;
+            if (UserManagementModule != null)
+            {
+                agentIsLocal = UserManagementModule.IsLocalGridUser(agentID);
+                friendIsLocal = UserManagementModule.IsLocalGridUser(friendID);
+            }
+
             // Are they both local users?
-            if (account1 != null && account2 != null)
+            if (agentIsLocal && friendIsLocal)
             {
                 // local grid users
                 return base.StoreRights(agentID, friendID, rights);
             }
 
-            if (account1 != null) // agent is local, friend is foreigner
+            if (agentIsLocal) // agent is local, friend is foreigner
             {
                 FriendInfo[] finfos = GetFriends(agentID);
                 FriendInfo finfo = GetFriend(finfos, friendID);
@@ -412,7 +431,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 }
             }
 
-            if (account2 != null) // agent is foreigner, friend is local
+            if (friendIsLocal) // agent is foreigner, friend is local
             {
                 string agentUUI = GetUUI(friendID, agentID);
                 if (agentUUI != string.Empty)
@@ -427,10 +446,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         protected override void StoreBackwards(UUID friendID, UUID agentID)
         {
-            UserAccount account1 = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, agentID);
-            UserAccount account2 = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, friendID);
+            Boolean agentIsLocal = true;
+            Boolean friendIsLocal = true;
+            if (UserManagementModule != null)
+            {
+                agentIsLocal = UserManagementModule.IsLocalGridUser(agentID);
+                friendIsLocal = UserManagementModule.IsLocalGridUser(friendID);
+            }
+
             // Are they both local users?
-            if (account1 != null && account2 != null)
+            if (agentIsLocal && friendIsLocal)
             {
                 // local grid users
                 m_log.DebugFormat("[HGFRIENDS MODULE]: Users are both local");
@@ -444,10 +469,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         protected override void StoreFriendships(UUID agentID, UUID friendID)
         {
-            UserAccount agentAccount = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, agentID);
-            UserAccount friendAccount = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, friendID);
+            Boolean agentIsLocal = true;
+            Boolean friendIsLocal = true;
+            if (UserManagementModule != null)
+            {
+                agentIsLocal = UserManagementModule.IsLocalGridUser(agentID);
+                friendIsLocal = UserManagementModule.IsLocalGridUser(friendID);
+            }
+
             // Are they both local users?
-            if (agentAccount != null && friendAccount != null)
+            if (agentIsLocal && friendIsLocal)
             {
                 // local grid users
                 m_log.DebugFormat("[HGFRIENDS MODULE]: Users are both local");
@@ -484,7 +515,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             // Generate a random 8-character hex number that will sign this friendship
             string secret = UUID.Random().ToString().Substring(0, 8);
 
-            if (agentAccount != null) // agent is local, 'friend' is foreigner
+            if (agentIsLocal) // agent is local, 'friend' is foreigner
             {
                 // This may happen when the agent returned home, in which case the friend is not there
                 // We need to look for its information in the friends list itself
@@ -520,7 +551,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     friendsConn.NewFriendship(friendID, agentUUI + ";" + secret);
                 }
             }
-            else if (friendAccount != null) // 'friend' is local,  agent is foreigner
+            else if (friendIsLocal) // 'friend' is local,  agent is foreigner
             {
                 // store in the local friends service a reference to the foreign agent
                 FriendsService.StoreFriend(friendID.ToString(), agentUUI + ";" + secret, 1);
@@ -553,10 +584,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         protected override bool DeleteFriendship(UUID agentID, UUID exfriendID)
         {
-            UserAccount agentAccount = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, agentID);
-            UserAccount friendAccount = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, exfriendID);
+            Boolean agentIsLocal = true;
+            Boolean friendIsLocal = true;
+            if (UserManagementModule != null)
+            {
+                agentIsLocal = UserManagementModule.IsLocalGridUser(agentID);
+                friendIsLocal = UserManagementModule.IsLocalGridUser(exfriendID);
+            }
+
             // Are they both local users?
-            if (agentAccount != null && friendAccount != null)
+            if (agentIsLocal && friendIsLocal)
             {
                 // local grid users
                 return base.DeleteFriendship(agentID, exfriendID);
@@ -566,7 +603,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             string agentUUI = string.Empty;
             string friendUUI = string.Empty;
 
-            if (agentAccount != null) // agent is local, 'friend' is foreigner
+            if (agentIsLocal) // agent is local, 'friend' is foreigner
             {
                 // We need to look for its information in the friends list itself
                 FriendInfo[] finfos = GetFriends(agentID);
@@ -587,7 +624,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     return true;
                 }
             }
-            else if (friendAccount != null) // agent is foreigner, 'friend' is local
+            else if (friendIsLocal) // agent is foreigner, 'friend' is local
             {
                 agentUUI = GetUUI(exfriendID, agentID);
 

OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs

@@ -180,10 +180,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
 //            m_log.DebugFormat("[HG INSTANT MESSAGE]: Delivering IM to {0} via XMLRPC", im.toAgentID);
             // Is the user a local user?
-            UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, toAgentID);
             string url = string.Empty;
             bool foreigner = false;
-            if (account == null) // foreign user
+            if (UserManagementModule != null && !UserManagementModule.IsLocalGridUser(toAgentID)) // foreign user
             {
                 url = UserManagementModule.GetUserServerURL(toAgentID, "IMServerURI");
                 foreigner = true;

OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs

@@ -27,6 +27,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Timers;
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
@@ -42,6 +43,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         private static readonly ILog m_log = LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
+        private Timer m_logTimer = new Timer(10000);
+        private List<GridInstantMessage> m_logData = new List<GridInstantMessage>();
+        private string m_restUrl;
+
         /// <value>
         /// Is this module enabled?
         /// </value>
@@ -61,9 +66,12 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                         "InstantMessageModule", "InstantMessageModule") !=
                         "InstantMessageModule")
                     return;
+                m_restUrl = config.Configs["Messaging"].GetString("LogURL", String.Empty);
             }
             
             m_enabled = true;
+            m_logTimer.AutoReset = false;
+            m_logTimer.Elapsed += LogTimerElapsed;
         }
 
         public void AddRegion(Scene scene)
@@ -148,6 +156,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         {
             byte dialog = im.dialog;
 
+            if (client != null && dialog == (byte)InstantMessageDialog.MessageFromAgent)
+                LogInstantMesssage(im);
+
             if (dialog != (byte)InstantMessageDialog.MessageFromAgent
                 && dialog != (byte)InstantMessageDialog.StartTyping
                 && dialog != (byte)InstantMessageDialog.StopTyping
@@ -226,5 +237,35 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             //
             OnInstantMessage(null, msg);
         }
+
+        private void LogInstantMesssage(GridInstantMessage im)
+        {
+            if (m_logData.Count < 20)
+            {
+                // Restart the log write timer
+                m_logTimer.Stop();
+            }
+            if (!m_logTimer.Enabled)
+                m_logTimer.Start();
+
+            lock (m_logData)
+            {
+                m_logData.Add(im);
+            }
+        }
+
+        private void LogTimerElapsed(object source, ElapsedEventArgs e)
+        {
+            lock (m_logData)
+            {
+                if (m_restUrl != String.Empty && m_logData.Count > 0)
+                {
+                    bool success = SynchronousRestObjectRequester.MakeRequest<List<GridInstantMessage>, bool>("POST", m_restUrl + "/LogMessages/", m_logData);
+                    if (!success)
+                        m_log.ErrorFormat("[INSTANT MESSAGE]: Failed to save log data");
+                }
+                m_logData.Clear();
+            }
+        }
     }
 }

OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs

@@ -493,7 +493,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                         }
                         else
                         {
-                            sceneObjects.Add(SceneObjectSerializer.FromOriginalXmlFormat(xmlData));
+                            SceneObjectGroup deserializedObject = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
+
+                            if (deserializedObject != null)
+                                sceneObjects.Add(deserializedObject);
                         }
                         
                         foreach (SceneObjectGroup sog in sceneObjects)

OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs

@@ -412,7 +412,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         {
             int majorVersion, minorVersion;
             
-            if (options.ContainsKey("profile"))
+            if (options.ContainsKey("home"))
             {
                 majorVersion = 1;
                 minorVersion = 2;

OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs

@@ -122,12 +122,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 
                 scene.AddCommand(
                     this, "save iar",
-                    "save iar [--p|-profile=<url>] [--noassets] <first> <last> <inventory path> <password> [<IAR path>] [--v|-verbose]",
+                    "save iar [-h|--home=<url>] [--noassets] <first> <last> <inventory path> <password> [<IAR path>] [-c|--creators] [-v|--verbose]",
                     "Save user inventory archive (IAR).", 
                     "<first> is the user's first name." + Environment.NewLine
                     + "<last> is the user's last name." + Environment.NewLine
                     + "<inventory path> is the path inside the user's inventory for the folder/item to be saved." + Environment.NewLine
-                    + "-p|--profile=<url> adds the url of the profile service to the saved user information." + Environment.NewLine
+                    + "-h|--home=<url> adds the url of the profile service to the saved user information." + Environment.NewLine
                     + "-c|--creators preserves information about foreign creators." + Environment.NewLine
                     + "-v|--verbose extra debug messages." + Environment.NewLine
                     + "--noassets stops assets being saved to the IAR."
@@ -396,7 +396,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             OptionSet ops = new OptionSet();
             //ops.Add("v|version=", delegate(string v) { options["version"] = v; });
-            ops.Add("p|profile=", delegate(string v) { options["profile"] = v; });
+            ops.Add("h|home=", delegate(string v) { options["home"] = v; });
             ops.Add("v|verbose", delegate(string v) { options["verbose"] = v; });
             ops.Add("c|creators", delegate(string v) { options["creators"] = v; });
             ops.Add("noassets", delegate(string v) { options["noassets"] = v != null; });
@@ -408,13 +408,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 if (mainParams.Count < 6)
                 {
                     m_log.Error(
-                        "[INVENTORY ARCHIVER]: usage is save iar [--p|-profile=<url>] [--noassets] <first name> <last name> <inventory path> <user password> [<save file path>]");
+                        "[INVENTORY ARCHIVER]: usage is save iar [-h|--home=<url>] [--noassets] <first name> <last name> <inventory path> <user password> [<save file path>] [-c|--creators] [-v|--verbose]");
                     return;
                 }
     
                 m_log.Info("[INVENTORY ARCHIVER]: PLEASE NOTE THAT THIS FACILITY IS EXPERIMENTAL.  BUG REPORTS WELCOME.");
-                if (options.ContainsKey("profile"))
-                    m_log.WarnFormat("[INVENTORY ARCHIVER]: Please be aware that inventory archives with creator information are not compatible with OpenSim 0.7.0.2 and earlier.  Do not use the -profile option if you want to produce a compatible IAR");
+                if (options.ContainsKey("home"))
+                    m_log.WarnFormat("[INVENTORY ARCHIVER]: Please be aware that inventory archives with creator information are not compatible with OpenSim 0.7.0.2 and earlier.  Do not use the -home option if you want to produce a compatible IAR");
 
                 string firstName = mainParams[2];
                 string lastName = mainParams[3];

OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs

@@ -43,7 +43,7 @@ using OpenSim.Services.Interfaces;
 namespace OpenSim.Region.CoreModules.Avatar.Profile
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class BasicProfileModule : ISharedRegionModule
+    public class BasicProfileModule : IProfileModule, ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -57,6 +57,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile
 
         public void Initialise(IConfigSource config)
         {
+            // This can be reduced later as the loader will determine 
+            // whether we are needed
             if (config.Configs["Profile"] != null)
             {
                 if (config.Configs["Profile"].GetString("Module", string.Empty) != "BasicProfileModule")
@@ -65,14 +67,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile
 
             m_log.DebugFormat("[PROFILE MODULE]: Basic Profile Module enabled");
             m_Enabled = true;
-
         }
 
         public void AddRegion(Scene scene)
         {
             if (!m_Enabled)
                 return;
-
+            
             lock (m_Scenes)
             {
                 if (!m_Scenes.Contains(scene))
@@ -80,6 +81,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile
                     m_Scenes.Add(scene);
                     // Hook up events
                     scene.EventManager.OnNewClient += OnNewClient;
+                    scene.RegisterModuleInterface<IProfileModule>(this);
                 }
             }
         }
@@ -116,7 +118,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile
 
         public Type ReplaceableInterface
         {
-            get { return null; }
+            get { return typeof(IProfileModule); }
         }
 
         #endregion
@@ -170,4 +172,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile
         }
 
     }
-}
+}

OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs

@@ -204,13 +204,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     sp.ControllingClient.SendTeleportStart(teleportFlags);
 
                     sp.ControllingClient.SendLocalTeleport(position, lookAt, teleportFlags);
-                    sp.TeleportFlags = (TeleportFlags)teleportFlags;
+                    sp.TeleportFlags = (Constants.TeleportFlags)teleportFlags;
                     sp.Teleport(position);
 
                     foreach (SceneObjectGroup grp in sp.GetAttachments())
                     {
-                        if (grp.IsDeleted)
-                            sp.Scene.EventManager.TriggerOnScriptChangedEvent(grp.LocalId, (uint)Changed.TELEPORT);
+                        sp.Scene.EventManager.TriggerOnScriptChangedEvent(grp.LocalId, (uint)Changed.TELEPORT);
                     }
                 }
                 else // Another region possibly in another simulator
@@ -695,9 +694,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             Vector3 eastCross = new Vector3(boundaryDistance, 0, 0);
             Vector3 westCross = new Vector3(-1 * boundaryDistance, 0, 0);
 
-            // distance to edge that will trigger crossing
-
-
             // distance into new region to place avatar
             const float enterDistance = 0.5f;
 
@@ -979,29 +975,31 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                         m_log.DebugFormat(
                             "[ENTITY TRANSFER MODULE]: Failed validation of all attachments for region crossing of {0} from {1} to {2}.  Continuing.",
                             agent.Name, agent.Scene.RegionInfo.RegionName, neighbourRegion.RegionName);
-    
-                    pos = pos + (agent.Velocity);
-    
+
+                    pos = pos + agent.Velocity;
+                    Vector3 vel2 = new Vector3(agent.Velocity.X, agent.Velocity.Y, 0);
+
+                    agent.RemoveFromPhysicalScene();
                     SetInTransit(agent.UUID);
-                    AgentData cAgent = new AgentData();
+
+                    AgentData cAgent = new AgentData(); 
                     agent.CopyTo(cAgent);
                     cAgent.Position = pos;
                     if (isFlying)
                         cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY;
-                    cAgent.CallbackURI = m_scene.RegionInfo.ServerURI +
-                        "agent/" + agent.UUID.ToString() + "/" + m_scene.RegionInfo.RegionID.ToString() + "/release/";
-    
+
+                    // We don't need the callback anymnore
+                    cAgent.CallbackURI = String.Empty;
+
                     if (!m_scene.SimulationService.UpdateAgent(neighbourRegion, cAgent))
                     {
                         // region doesn't take it
                         ReInstantiateScripts(agent);
+                        agent.AddToPhysicalScene(isFlying);
                         ResetFromTransit(agent.UUID);
                         return agent;
                     }
     
-                    // Next, let's close the child agent connections that are too far away.
-                    agent.CloseChildAgents(neighbourx, neighboury);
-    
                     //AgentCircuitData circuitdata = m_controllingClient.RequestClientInfo();
                     agent.ControllingClient.RequestClientInfo();
     
@@ -1018,11 +1016,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     string capsPath = neighbourRegion.ServerURI + CapsUtil.GetCapsSeedPath(agentcaps);
     
                     m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID);
-    
+
                     IEventQueue eq = agent.Scene.RequestModuleInterface<IEventQueue>();
                     if (eq != null)
                     {
-                        eq.CrossRegion(neighbourHandle, pos, agent.Velocity, neighbourRegion.ExternalEndPoint,
+                        eq.CrossRegion(neighbourHandle, pos, vel2 /* agent.Velocity */, neighbourRegion.ExternalEndPoint,
                                        capsPath, agent.UUID, agent.ControllingClient.SessionId);
                     }
                     else
@@ -1030,32 +1028,26 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                         agent.ControllingClient.CrossRegion(neighbourHandle, pos, agent.Velocity, neighbourRegion.ExternalEndPoint,
                                                     capsPath);
                     }
-    
-                    if (!WaitForCallback(agent.UUID))
-                    {
-                        m_log.Debug("[ENTITY TRANSFER MODULE]: Callback never came in crossing agent");
-                        ReInstantiateScripts(agent);
-                        ResetFromTransit(agent.UUID);
-    
-                        // Yikes! We should just have a ref to scene here.
-                        //agent.Scene.InformClientOfNeighbours(agent);
-                        EnableChildAgents(agent);
-    
-                        return agent;
-                    }
-    
+
+                    // SUCCESS! 
                     agent.MakeChildAgent();
-    
+                    ResetFromTransit(agent.UUID);
+
                     // now we have a child agent in this region. Request all interesting data about other (root) agents
                     agent.SendOtherAgentsAvatarDataToMe();
                     agent.SendOtherAgentsAppearanceToMe();
-    
-                    // Backwards compatibility
+
+                    // Backwards compatibility. Best effort
                     if (version == "Unknown" || version == string.Empty)
                     {
-                        m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Old neighbor, passing attachments one by one...");
+                        m_log.DebugFormat("[ENTITY TRANSFER MODULE]: neighbor with old version, passing attachments one by one...");
+                        Thread.Sleep(3000); // wait a little now that we're not waiting for the callback
                         CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true);
                     }
+
+
+                    // Next, let's close the child agent connections that are too far away.
+                    agent.CloseChildAgents(neighbourx, neighboury);
     
                     AgentHasMovedAway(agent, false);
     
@@ -1088,16 +1080,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             CrossAgentToNewRegionDelegate icon = (CrossAgentToNewRegionDelegate)iar.AsyncState;
             ScenePresence agent = icon.EndInvoke(iar);
 
-            // If the cross was successful, this agent is a child agent
-            if (agent.IsChildAgent)
-                agent.Reset();
-            else // Not successful
-                agent.RestoreInCurrentScene();
+            //// If the cross was successful, this agent is a child agent
+            //if (agent.IsChildAgent)
+            //    agent.Reset();
+            //else // Not successful
+            //    agent.RestoreInCurrentScene();
 
             // In any case
             agent.IsInTransit = false;
 
-            //m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Crossing agent {0} {1} completed.", agent.Firstname, agent.Lastname);
+            m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Crossing agent {0} {1} completed.", agent.Firstname, agent.Lastname);
         }
 
         #endregion
@@ -1236,7 +1228,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     AgentCircuitData agent = sp.ControllingClient.RequestClientInfo();
                     agent.BaseFolder = UUID.Zero;
                     agent.InventoryFolder = UUID.Zero;
-                    agent.startpos = new Vector3(128, 128, 70);
+                    agent.startpos = sp.AbsolutePosition + CalculateOffset(sp, neighbour);
                     agent.child = true;
                     agent.Appearance = sp.Appearance;
                     if (currentAgentCircuit != null)
@@ -1329,6 +1321,17 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
         }
 
+        Vector3 CalculateOffset(ScenePresence sp, GridRegion neighbour)
+        {
+            int rRegionX = (int)sp.Scene.RegionInfo.RegionLocX;
+            int rRegionY = (int)sp.Scene.RegionInfo.RegionLocY;
+            int tRegionX = neighbour.RegionLocX / (int)Constants.RegionSize;
+            int tRegionY = neighbour.RegionLocY / (int)Constants.RegionSize;
+            int shiftx = (rRegionX - tRegionX) * (int)Constants.RegionSize;
+            int shifty = (rRegionY - tRegionY) * (int)Constants.RegionSize;
+            return new Vector3(shiftx, shifty, 0f);
+        }
+
         private void InformClientOfNeighbourCompleted(IAsyncResult iar)
         {
             InformClientOfNeighbourDelegate icon = (InformClientOfNeighbourDelegate)iar.AsyncState;
@@ -1723,9 +1726,23 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             uint x = 0, y = 0;
             Utils.LongToUInts(newRegionHandle, out x, out y);
             GridRegion destination = scene.GridService.GetRegionByPosition(scene.RegionInfo.ScopeID, (int)x, (int)y);
-            if (destination != null && !CrossPrimGroupIntoNewRegion(destination, grp, silent))
+
+            if (destination == null || !CrossPrimGroupIntoNewRegion(destination, grp, silent))
             {
-                grp.RootPart.GroupPosition = oldGroupPosition;
+                m_log.InfoFormat("[ENTITY TRANSFER MODULE] cross region transfer failed for object {0}",grp.UUID);
+
+                // Need to turn off the physics flags, otherwise the object will continue to attempt to
+                // move out of the region creating an infinite loop of failed attempts to cross
+                grp.UpdatePrimFlags(grp.RootPart.LocalId,false,grp.IsTemporary,grp.IsPhantom,false);
+
+                // We are going to move the object back to the old position so long as the old position
+                // is in the region
+                oldGroupPosition.X = Util.Clamp<float>(oldGroupPosition.X,1.0f,(float)Constants.RegionSize-1);
+                oldGroupPosition.Y = Util.Clamp<float>(oldGroupPosition.Y,1.0f,(float)Constants.RegionSize-1);
+                oldGroupPosition.Z = Util.Clamp<float>(oldGroupPosition.Z,1.0f,4096.0f);
+
+                grp.AbsolutePosition = oldGroupPosition;
+
                 grp.ScheduleGroupForFullUpdate();
             }
         }

OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs

@@ -123,7 +123,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Destination region {0} is hyperlink", region.RegionID);
                 GridRegion real_destination = m_GatekeeperConnector.GetHyperlinkRegion(region, region.RegionID);
-                m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: GetFinalDestination serveruri -> {0}", real_destination.ServerURI);
+                if (real_destination != null)
+                    m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: GetFinalDestination serveruri -> {0}", real_destination.ServerURI);
+                else
+                    m_log.WarnFormat("[HG ENTITY TRANSFER MODULE]: GetHyperlinkRegion to Gatekeeper {0} failed", region.ServerURI);
                 return real_destination;
             }
             return region;
@@ -189,8 +192,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.FirstName, client.LastName);
 
             // Let's find out if this is a foreign user or a local user
-            UserAccount account = m_aScene.UserAccountService.GetUserAccount(m_aScene.RegionInfo.ScopeID, id);
-            if (account != null)
+            IUserManagement uMan = m_aScene.RequestModuleInterface<IUserManagement>(); 
+            if (uMan != null && uMan.IsLocalGridUser(id))
             {
                 // local grid user
                 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: User is local");
@@ -228,8 +231,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             IEventQueue eq = sp.Scene.RequestModuleInterface<IEventQueue>();
             GridRegion homeGatekeeper = MakeRegion(aCircuit);
             
-            m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: teleporting user {0} {1} home to {2} via {3}:{4}:{5}",
-                aCircuit.firstname, aCircuit.lastname, finalDestination.RegionName, homeGatekeeper.ExternalHostName, homeGatekeeper.HttpPort, homeGatekeeper.RegionName);
+            m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: teleporting user {0} {1} home to {2} via {3}:{4}",
+                aCircuit.firstname, aCircuit.lastname, finalDestination.RegionName, homeGatekeeper.ServerURI, homeGatekeeper.RegionName);
 
             DoTeleport(sp, homeGatekeeper, finalDestination, position, lookAt, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome), eq);
             return true;
@@ -315,8 +318,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 }
 
                 // Let's find out if this is a foreign user or a local user
+                IUserManagement uMan = m_aScene.RequestModuleInterface<IUserManagement>();
                 UserAccount account = m_aScene.UserAccountService.GetUserAccount(m_aScene.RegionInfo.ScopeID, obj.AgentId);
-                if (account != null)
+                if (uMan != null && uMan.IsLocalGridUser(obj.AgentId))
                 {
                     // local grid user
                     return;
@@ -349,6 +353,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             region.ExternalHostName = uri.Host;
             region.HttpPort = (uint)uri.Port;
+            region.ServerURI = aCircuit.ServiceURLs["HomeURI"].ToString();
             region.RegionName = string.Empty;
             region.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), (int)0);
             return region;

OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs

@@ -55,16 +55,16 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 //        private Dictionary<string, InventoryClient> m_inventoryServers = new Dictionary<string, InventoryClient>();
 
         private Scene m_scene;
-        private string m_ProfileServerURI;
+        private string m_HomeURI;
 
         #endregion
 
         #region Constructor
 
-        public HGAssetMapper(Scene scene, string profileURL)
+        public HGAssetMapper(Scene scene, string homeURL)
         {
             m_scene = scene;
-            m_ProfileServerURI = profileURL;
+            m_HomeURI = homeURL;
         }
 
         #endregion
@@ -73,7 +73,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
         public AssetBase FetchAsset(string url, UUID assetID)
         {
-            AssetBase asset = m_scene.AssetService.Get(url + "/" + assetID.ToString());
+            if (!url.EndsWith("/") && !url.EndsWith("="))
+                url = url + "/";
+
+            AssetBase asset = m_scene.AssetService.Get(url + assetID.ToString());
 
             if (asset != null)
             {
@@ -87,6 +90,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         {
             if (asset != null)
             {
+                if (!url.EndsWith("/") && !url.EndsWith("="))
+                    url = url + "/";
+
                 // See long comment in AssetCache.AddAsset
                 if (!asset.Temporary || asset.Local)
                 {
@@ -99,7 +105,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     Copy(asset, asset1);
                     try
                     {
-                        asset1.ID = url + "/" + asset.ID;
+                        asset1.ID = url + asset.ID;
                     }
                     catch
                     {
@@ -144,7 +150,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 UUID.TryParse(meta.CreatorID, out uuid);
                 UserAccount creator = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, uuid); 
                 if (creator != null)
-                    meta.CreatorID = m_ProfileServerURI + "/" + meta.CreatorID + ";" + creator.FirstName + " " + creator.LastName;
+                    meta.CreatorID = m_HomeURI + ";" + creator.FirstName + " " + creator.LastName;
             }
         }
 
@@ -187,7 +193,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 if (!hasCreatorData && creator != null)
                 {
                     XmlElement creatorData = doc.CreateElement("CreatorData");
-                    creatorData.InnerText = m_ProfileServerURI + "/" + creator.PrincipalID + ";" + creator.FirstName + " " + creator.LastName;
+                    creatorData.InnerText = m_HomeURI + ";" + creator.FirstName + " " + creator.LastName;
                     sop.AppendChild(creatorData);
                 }
             }

OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs

@@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             get { return m_assMapper; }
         }
 
-        private string m_ProfileServerURI;
+        private string m_HomeURI;
         private bool m_OutboundPermission;
         private string m_ThisGatekeeper;
 
@@ -84,7 +84,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     IConfig thisModuleConfig = source.Configs["HGInventoryAccessModule"];
                     if (thisModuleConfig != null)
                     {
-                        m_ProfileServerURI = thisModuleConfig.GetString("ProfileServerURI", string.Empty);
+                        // legacy configuration [obsolete]
+                        m_HomeURI = thisModuleConfig.GetString("ProfileServerURI", string.Empty);
+                        // preferred
+                        m_HomeURI = thisModuleConfig.GetString("HomeURI", m_HomeURI);
                         m_OutboundPermission = thisModuleConfig.GetBoolean("OutboundPermission", true);
                         m_ThisGatekeeper = thisModuleConfig.GetString("Gatekeeper", string.Empty);
                     }
@@ -100,7 +103,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 return;
 
             base.AddRegion(scene);
-            m_assMapper = new HGAssetMapper(scene, m_ProfileServerURI);
+            m_assMapper = new HGAssetMapper(scene, m_HomeURI);
             scene.EventManager.OnNewInventoryItemUploadComplete += UploadInventoryItem;
 
         }
@@ -124,8 +127,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
         protected override string GenerateLandmark(ScenePresence presence, out string prefix, out string suffix)
         {
-            UserAccount account = m_Scene.UserAccountService.GetUserAccount(m_Scene.RegionInfo.ScopeID, presence.UUID);
-            if (account == null)
+            if (UserManagementModule != null && !UserManagementModule.IsLocalGridUser(presence.UUID))
                 prefix = "HG ";
             else
                 prefix = string.Empty;
@@ -210,12 +212,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         public override bool IsForeignUser(UUID userID, out string assetServerURL)
         {
             assetServerURL = string.Empty;
-            UserAccount account = null;
-            if (m_Scene.UserAccountService != null)
-                account = m_Scene.UserAccountService.GetUserAccount(m_Scene.RegionInfo.ScopeID, userID);
 
-            if (account == null) // foreign
-            {
+            if (UserManagementModule != null && !UserManagementModule.IsLocalGridUser(userID))
+            { // foreign 
                 ScenePresence sp = null;
                 if (m_Scene.TryGetScenePresence(userID, out sp))
                 {

OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs

@@ -367,6 +367,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
                 originalPositions[objectGroup.UUID] = objectGroup.AbsolutePosition;
 
+                // Restore attachment data after trip through the sim
+                if (objectGroup.RootPart.AttachPoint > 0)
+                    inventoryStoredPosition = objectGroup.RootPart.AttachOffset;
+                objectGroup.RootPart.Shape.State = objectGroup.RootPart.AttachPoint;
+
                 objectGroup.AbsolutePosition = inventoryStoredPosition;
 
                 // Make sure all bits but the ones we want are clear
@@ -476,8 +481,17 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             IClientAPI remoteClient)
         {
             uint effectivePerms = (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify | PermissionMask.Move) | 7;
+            // For the porposes of inventory, an object is modify if the prims
+            // are modify. This allows renaming an object that contains no
+            // mod items.
             foreach (SceneObjectGroup grp in objsForEffectivePermissions)
-                effectivePerms &= grp.GetEffectivePermissions(true);
+            {
+                uint groupPerms = grp.GetEffectivePermissions(true);
+                if ((grp.RootPart.BaseMask & (uint)PermissionMask.Modify) != 0)
+                    groupPerms |= (uint)PermissionMask.Modify;
+
+                effectivePerms &= groupPerms;
+            }
             effectivePerms |= (uint)PermissionMask.Move;
 
             if (remoteClient != null && (remoteClient.AgentId != so.RootPart.OwnerID) && m_Scene.Permissions.PropagatePermissions())
@@ -546,12 +560,20 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     return null;
 
                 userID = remoteClient.AgentId;
+
+//                m_log.DebugFormat(
+//                    "[INVENTORY ACCESS MODULE]: Target of {0} in CreateItemForObject() is {1} {2}",
+//                    action, remoteClient.Name, userID);
             }
             else
             {
                 // All returns / deletes go to the object owner
                 //
                 userID = so.RootPart.OwnerID;
+
+//                m_log.DebugFormat(
+//                    "[INVENTORY ACCESS MODULE]: Target of {0} in CreateItemForObject() is object owner {1}",
+//                    action, userID);
             }
 
             if (userID == UUID.Zero) // Can't proceed
@@ -637,14 +659,15 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 }
 
                 // Override and put into where it came from, if it came
-                // from anywhere in inventory
+                // from anywhere in inventory and the owner is taking it back.
                 //
                 if (action == DeRezAction.Take || action == DeRezAction.TakeCopy)
                 {
-                    if (so.RootPart.FromFolderID != UUID.Zero)
+                    if (so.RootPart.FromFolderID != UUID.Zero && userID == remoteClient.AgentId)
                     {
                         InventoryFolderBase f = new InventoryFolderBase(so.RootPart.FromFolderID, userID);
-                        folder = m_Scene.InventoryService.GetFolder(f);
+                        if (f != null)
+                            folder = m_Scene.InventoryService.GetFolder(f);
                     }
                 }
 
@@ -683,12 +706,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 return null;
             }
 
-
-
-
-
-
-
             item.Owner = remoteClient.AgentId;
 
             return RezObject(
@@ -736,6 +753,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             if (e == null || attachment) // Single
             {
                 SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
+                if (!attachment)
+                {
+                    g.RootPart.AttachPoint = g.RootPart.Shape.State;
+                    g.RootPart.AttachOffset = g.AbsolutePosition;
+                }
 
                 objlist.Add(g);
                 veclist.Add(new Vector3(0, 0, 0));
@@ -765,6 +787,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 foreach (XmlNode n in groups)
                 {
                     SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(n.OuterXml);
+                    g.RootPart.AttachPoint = g.RootPart.Shape.State;
+                    g.RootPart.AttachOffset = g.AbsolutePosition;
 
                     objlist.Add(g);
                     XmlElement el = (XmlElement)n;
@@ -784,13 +808,42 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 }
             }
 
+            int primcount = 0;
+            foreach (SceneObjectGroup g in objlist)
+                primcount += g.PrimCount;
+
+            if (!m_Scene.Permissions.CanRezObject(
+                primcount, remoteClient.AgentId, pos)
+                && !attachment)
+            {
+                // The client operates in no fail mode. It will
+                // have already removed the item from the folder
+                // if it's no copy.
+                // Put it back if it's not an attachment
+                //
+                if (item != null)
+                {
+                    if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!attachment))
+                        remoteClient.SendBulkUpdateInventory(item);
+                }
+
+                return null;
+            }
+
             if (item != null && !DoPreRezWhenFromItem(remoteClient, item, objlist, pos, attachment))
                 return null;
+
             for (int i = 0; i < objlist.Count; i++)
             {
                 group = objlist[i];
                 SceneObjectPart rootPart = group.RootPart;
 
+//                m_log.DebugFormat(
+//                    "[InventoryAccessModule]: Preparing to rez {0} {1} {2} ownermask={3:X} nextownermask={4:X} groupmask={5:X} everyonemask={6:X} for {7}",
+//                    group.Name, group.LocalId, group.UUID,
+//                    group.RootPart.OwnerMask, group.RootPart.NextOwnerMask, group.RootPart.GroupMask, group.RootPart.EveryoneMask,
+//                    remoteClient.Name);
+
 //                        Vector3 storedPosition = group.AbsolutePosition;
                 if (group.UUID == UUID.Zero)
                 {
@@ -854,47 +907,15 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     rootPart.ScheduleFullUpdate();
                 }
 
-                if ((rootPart.OwnerID != item.Owner) ||
-                                (item.CurrentPermissions & 16) != 0 || // Magic number
-                                (item.Flags & (uint)InventoryItemFlags.ObjectSlamPerm) != 0)
-                {
-                    //Need to kill the for sale here
-                    rootPart.ObjectSaleType = 0;
-                    rootPart.SalePrice = 10;
-
-                    if (m_Scene.Permissions.PropagatePermissions())
-                    {
-                        foreach (SceneObjectPart part in group.Parts)
-                        {
-                            if ((item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0)
-                            {
-                                if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteEveryone) != 0)
-                                    part.EveryoneMask = item.EveryOnePermissions;
-                                if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteNextOwner) != 0)
-                                    part.NextOwnerMask = item.NextPermissions;
-                                if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteGroup) != 0)
-                                    part.GroupMask = item.GroupPermissions;
-                            }
-                        }
-
-                        foreach (SceneObjectPart part in group.Parts)
-                        {
-                            part.LastOwnerID = part.OwnerID;
-                            part.OwnerID = item.Owner;
-                            part.Inventory.ChangeInventoryOwner(item.Owner);
-                        }
-
-                        group.ApplyNextOwnerPermissions();
-                    }
-                }
-
-//                        m_log.DebugFormat(
-//                            "[InventoryAccessModule]: Rezzed {0} {1} {2} for {3}",
-//                            group.Name, group.LocalId, group.UUID, remoteClient.Name);
+//                m_log.DebugFormat(
+//                    "[InventoryAccessModule]: Rezzed {0} {1} {2} ownermask={3:X} nextownermask={4:X} groupmask={5:X} everyonemask={6:X} for {7}",
+//                    group.Name, group.LocalId, group.UUID,
+//                    group.RootPart.OwnerMask, group.RootPart.NextOwnerMask, group.RootPart.GroupMask, group.RootPart.EveryoneMask,
+//                    remoteClient.Name);
             }
 
-                        group.SetGroup(remoteClient.ActiveGroupId, remoteClient);
-                        // TODO: Remove the magic number badness
+            group.SetGroup(remoteClient.ActiveGroupId, remoteClient);
+
             if (item != null)
                 DoPostRezWhenFromItem(item, attachment);
 
@@ -934,25 +955,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 }
             }
 
-            int primcount = 0;
-            foreach (SceneObjectGroup g in objlist)
-                primcount += g.PrimCount;
-
-            if (!m_Scene.Permissions.CanRezObject(
-                primcount, remoteClient.AgentId, pos)
-                && !isAttachment)
-            {
-                // The client operates in no fail mode. It will
-                // have already removed the item from the folder
-                // if it's no copy.
-                // Put it back if it's not an attachment
-                //
-                if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!isAttachment))
-                    remoteClient.SendBulkUpdateInventory(item);
-
-                return false;
-            }
-
             for (int i = 0; i < objlist.Count; i++)
             {
                 SceneObjectGroup so = objlist[i];
@@ -968,14 +970,21 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 {
                     rootPart.Name = item.Name;
                     rootPart.Description = item.Description;
-                    rootPart.ObjectSaleType = item.SaleType;
-                    rootPart.SalePrice = item.SalePrice;
+                    if ((item.Flags & (uint)InventoryItemFlags.ObjectSlamSale) != 0)
+                    {
+                        rootPart.ObjectSaleType = item.SaleType;
+                        rootPart.SalePrice = item.SalePrice;
+                    }
                 }
 
                 rootPart.FromFolderID = item.Folder;
-    
+
+//                Console.WriteLine("rootPart.OwnedID {0}, item.Owner {1}, item.CurrentPermissions {2:X}",
+//                                  rootPart.OwnerID, item.Owner, item.CurrentPermissions);
+
                 if ((rootPart.OwnerID != item.Owner) ||
-                    (item.CurrentPermissions & 16) != 0)
+                    (item.CurrentPermissions & 16) != 0 ||
+                    (item.Flags & (uint)InventoryItemFlags.ObjectSlamPerm) != 0)
                 {
                     //Need to kill the for sale here
                     rootPart.ObjectSaleType = 0;
@@ -985,31 +994,43 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     {
                         foreach (SceneObjectPart part in so.Parts)
                         {
-                            if ((item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0)
-                            {
-                                part.EveryoneMask = item.EveryOnePermissions;
-                                part.NextOwnerMask = item.NextPermissions;
-                            }
                             part.GroupMask = 0; // DO NOT propagate here
+
+                            part.LastOwnerID = part.OwnerID;
+                            part.OwnerID = item.Owner;
+                            part.Inventory.ChangeInventoryOwner(item.Owner);
                         }
     
                         so.ApplyNextOwnerPermissions();
+
+                        // In case the user has changed flags on a received item
+                        // we have to apply those changes after the slam. Else we
+                        // get a net loss of permissions
+                        foreach (SceneObjectPart part in so.Parts)
+                        {
+                            if ((item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0)
+                            {
+                                if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteEveryone) != 0)
+                                    part.EveryoneMask = item.EveryOnePermissions & part.BaseMask;
+                                if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteNextOwner) != 0)
+                                    part.NextOwnerMask = item.NextPermissions & part.BaseMask;
+                            }
+                        }
                     }
                 }
-    
-                foreach (SceneObjectPart part in so.Parts)
+                else
                 {
-                    part.FromUserInventoryItemID = fromUserInventoryItemId;
-
-                    if ((part.OwnerID != item.Owner) ||
-                        (item.CurrentPermissions & 16) != 0)
+                    foreach (SceneObjectPart part in so.Parts)
                     {
-                        part.Inventory.ChangeInventoryOwner(item.Owner);
-                        part.GroupMask = 0; // DO NOT propagate here
-                    }
+                        part.FromUserInventoryItemID = fromUserInventoryItemId;
 
-                    part.EveryoneMask = item.EveryOnePermissions;
-                    part.NextOwnerMask = item.NextPermissions;
+                        if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteEveryone) != 0)
+                            part.EveryoneMask = item.EveryOnePermissions;
+                        if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteNextOwner) != 0)
+                            part.NextOwnerMask = item.NextPermissions;
+                        if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteGroup) != 0)
+                            part.GroupMask = item.GroupPermissions;
+                    }
                 }
     
                 rootPart.TrimPermissions();

OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs

@@ -322,66 +322,85 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             user.Id = uuid;
             user.FirstName = first;
             user.LastName = last;
-            // user.ProfileURL = we should initialize this to the default
 
             AddUserInternal(user);
         }
 
-        public void AddUser(UUID uuid, string first, string last, string profileURL)
+        public void AddUser(UUID uuid, string first, string last, string homeURL)
         {
-            AddUser(uuid, profileURL + ";" + first + " " + last);
+            AddUser(uuid, homeURL + ";" + first + " " + last);
         }
 
-        public void AddUser(UUID id, string creatorData)
+        public void AddUser (UUID id, string creatorData)
         {
+            UserData oldUser;
+            //lock the whole block - prevent concurrent update
             lock (m_UserCache)
             {
-                if (m_UserCache.ContainsKey(id))
-                    return;
-            }
-
-//            m_log.DebugFormat("[USER MANAGEMENT MODULE]: Adding user with id {0}, craetorData {1}", id, creatorData);
-
-            UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, id);
-
-            if (account != null)
-            {
-                AddUser(id, account.FirstName, account.LastName);
-            }
-            else
-            {
-                UserData user = new UserData();
-                user.Id = id;
-
-                if (creatorData != null && creatorData != string.Empty)
+                m_UserCache.TryGetValue (id, out oldUser);
+                if (oldUser != null)
                 {
-                    //creatorData = <endpoint>;<name>
-
-                    string[] parts = creatorData.Split(';');
-                    if (parts.Length >= 1)
+                    if (creatorData == null || creatorData == String.Empty)
                     {
-                        user.HomeURL = parts[0];
-                        try
-                        {
-                            Uri uri = new Uri(parts[0]);
-                            user.LastName = "@" + uri.Authority;
-                        }
-                        catch (UriFormatException)
-                        {
-                            m_log.DebugFormat("[SCENE]: Unable to parse Uri {0}", parts[0]);
-                            user.LastName = "@unknown";
-                        }
+                        //ignore updates without creator data
+                        return;
                     }
-                    if (parts.Length >= 2)
-                        user.FirstName = parts[1].Replace(' ', '.');
+                    //try update unknown users
+                    //and creator's home URL's
+                    if ((oldUser.FirstName == "Unknown" && !creatorData.Contains ("Unknown")) || (oldUser.HomeURL != null && !creatorData.StartsWith (oldUser.HomeURL)))
+                    {
+                        m_UserCache.Remove (id);
+//                      m_log.DebugFormat("[USER MANAGEMENT MODULE]: Re-adding user with id {0}, creatorData [{1}] and old HomeURL {2}", id, creatorData,oldUser.HomeURL);
+                    }
+                    else
+                    {
+                        //we have already a valid user within the cache
+                        return;
+                    }
+                }
+//              m_log.DebugFormat("[USER MANAGEMENT MODULE]: Adding user with id {0}, creatorData {1}", id, creatorData);
+
+                UserAccount account = m_Scenes [0].UserAccountService.GetUserAccount (m_Scenes [0].RegionInfo.ScopeID, id);
+
+                if (account != null)
+                {
+                    AddUser (id, account.FirstName, account.LastName);
                 }
                 else
                 {
-                    user.FirstName = "Unknown";
-                    user.LastName = "User";
-                }
+                    UserData user = new UserData ();
+                    user.Id = id;
 
-                AddUserInternal(user);
+                    if (creatorData != null && creatorData != string.Empty)
+                    {
+                        //creatorData = <endpoint>;<name>
+
+                        string[] parts = creatorData.Split (';');
+                        if (parts.Length >= 1)
+                        {
+                            user.HomeURL = parts [0];
+                            try
+                            {
+                                Uri uri = new Uri (parts [0]);
+                                user.LastName = "@" + uri.Authority;
+                            }
+                            catch (UriFormatException)
+                            {
+                                m_log.DebugFormat ("[SCENE]: Unable to parse Uri {0}", parts [0]);
+                                user.LastName = "@unknown";
+                            }
+                        }
+                        if (parts.Length >= 2)
+                            user.FirstName = parts [1].Replace (' ', '.');
+                    }
+                    else
+                    {
+                        user.FirstName = "Unknown";
+                        user.LastName = "User";
+                    }
+
+                    AddUserInternal (user);
+                }
             }
         }
 
@@ -395,35 +414,14 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 //                user.Id, user.FirstName, user.LastName, user.HomeURL);
         }
 
-        //public void AddUser(UUID uuid, string userData)
-        //{
-        //    if (m_UserCache.ContainsKey(uuid))
-        //        return;
+        public bool IsLocalGridUser(UUID uuid)
+        {
+            UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, uuid);
+            if (account == null || (account != null && !account.LocalToGrid))
+                return false;
 
-        //    UserData user = new UserData();
-        //    user.Id = uuid;
-
-        //    // userData = <profile url>;<name>
-        //    string[] parts = userData.Split(';');
-        //    if (parts.Length >= 1)
-        //        user.ProfileURL = parts[0].Trim();
-        //    if (parts.Length >= 2)
-        //    {
-        //        string[] name = parts[1].Trim().Split(' ');
-        //        if (name.Length >= 1)
-        //            user.FirstName = name[0];
-        //        if (name.Length >= 2)
-        //            user.LastName = name[1];
-        //        else
-        //            user.LastName = "?";
-        //    }
-
-        //    lock (m_UserCache)
-        //        m_UserCache.Add(uuid, user);
-
-        //    m_log.DebugFormat("[USER MANAGEMENT MODULE]: Added user {0} {1} {2} {3}", user.Id, user.FirstName, user.LastName, user.ProfileURL);
-
-        //}
+            return true;
+        }
 
         #endregion IUserManagement
 

OpenSim/Region/CoreModules/LightShare/LightShareModule.cs

@@ -153,10 +153,18 @@ namespace OpenSim.Region.CoreModules.World.LightShare
 
         public void SendProfileToClient(IClientAPI client, RegionLightShareData wl)
         {
-            if (m_enableWindlight && m_scene.RegionInfo.WindlightSettings.valid)
+            if (m_enableWindlight)
             {
-                List<byte[]> param = compileWindlightSettings(wl);
-                client.SendGenericMessage("Windlight", param);
+                if (m_scene.RegionInfo.WindlightSettings.valid)
+                {
+                    List<byte[]> param = compileWindlightSettings(wl);
+                    client.SendGenericMessage("Windlight", param);
+                }
+                else
+                {
+                    List<byte[]> param = new List<byte[]>();
+                    client.SendGenericMessage("WindlightReset", param);
+                }
             }
         }
 
@@ -176,8 +184,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare
 
         private void EventManager_OnSaveNewWindlightProfile()
         {
-            if (m_scene.RegionInfo.WindlightSettings.valid)
-                m_scene.ForEachRootClient(SendProfileToClient);
+            m_scene.ForEachRootClient(SendProfileToClient);
         }
 
         public void PostInitialise()

OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs

@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Net;
+using System.Net.Mail;
 using System.Net.Security;
 using System.Text;
 using System.Threading;
@@ -111,21 +112,36 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
             X509Chain  chain,
             SslPolicyErrors  sslPolicyErrors)
         {
-            HttpWebRequest Request = (HttpWebRequest)sender;
-
-            if (Request.Headers.Get("NoVerifyCert") != null)
+            // If this is a web request we need to check the headers first
+            // We may want to ignore SSL
+            if (sender is HttpWebRequest)
             {
+                HttpWebRequest Request = (HttpWebRequest)sender;
+                ServicePoint sp = Request.ServicePoint;
+
+                // We don't case about encryption, get out of here
+                if (Request.Headers.Get("NoVerifyCert") != null)
+                {
+                    return true;
+                }
+
+                // If there was an upstream cert verification error, bail
+                if ((((int)sslPolicyErrors) & ~4) != 0)
+                    return false;
+
+                // Check for policy and execute it if defined
+                if (ServicePointManager.CertificatePolicy != null)
+                {
+                    return ServicePointManager.CertificatePolicy.CheckValidationResult (sp, certificate, Request, 0);
+                }
+
                 return true;
             }
-            
+
+            // If it's not HTTP, trust .NET to check it
             if ((((int)sslPolicyErrors) & ~4) != 0)
                 return false;
 
-            if (ServicePointManager.CertificatePolicy != null)
-            {
-                ServicePoint sp = Request.ServicePoint;
-                return ServicePointManager.CertificatePolicy.CheckValidationResult (sp, certificate, Request, 0);
-            }
             return true;
         }
         #region IHttpRequestModule Members
@@ -415,8 +431,21 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                 }
 
                 Request.Timeout = HttpTimeout;
-                // execute the request
-                response = (HttpWebResponse) Request.GetResponse();
+                try
+                {
+                    // execute the request
+                    response = (HttpWebResponse) Request.GetResponse();
+                }
+                catch (WebException e)
+                {
+                    if (e.Status != WebExceptionStatus.ProtocolError)
+                    {
+                        throw;
+                    }
+                    response = (HttpWebResponse)e.Response;
+                }
+
+                Status = (int)response.StatusCode;
 
                 Stream resStream = response.GetResponseStream();
 
@@ -473,7 +502,6 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                     response.Close();
             }
 
-            Status = (int)OSHttpStatusCode.SuccessOk;
             _finished = true;
         }
 

OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs

@@ -132,6 +132,12 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
 
         public void RegionLoaded(Scene scene)
         {
+            IScriptModule[] scriptModules = scene.RequestModuleInterfaces<IScriptModule>();
+            foreach (IScriptModule scriptModule in scriptModules)
+            {
+                scriptModule.OnScriptRemoved += ScriptRemoved;
+                scriptModule.OnObjectRemoved += ObjectRemoved;
+            }
         }
 
         public void RemoveRegion(Scene scene)
@@ -289,6 +295,8 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
 
         public void ScriptRemoved(UUID itemID)
         {
+//            m_log.DebugFormat("[URL MODULE]: Removing script {0}", itemID);
+            
             lock (m_UrlMap)
             {
                 List<string> removeURLs = new List<string>();

OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs

@@ -382,23 +382,5 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
             return result;
         }
 
-        #region IHyperAssetService
-
-        public string GetUserAssetServer(UUID userID)
-        {
-            UserAccount account = m_aScene.UserAccountService.GetUserAccount(m_aScene.RegionInfo.ScopeID, userID);
-
-            if (account != null && account.ServiceURLs.ContainsKey("AssetServerURI") && account.ServiceURLs["AssetServerURI"] != null)
-                return account.ServiceURLs["AssetServerURI"].ToString();
-
-            return string.Empty;
-        }
-
-        public string GetSimAssetServer()
-        {
-            return m_LocalAssetServiceURI;
-        }
-
-        #endregion
     }
 }

OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs

@@ -170,6 +170,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
         public AssetBase GetCached(string id)
         {
+//            m_log.DebugFormat("[LOCAL ASSET SERVICES CONNECTOR]: Cache request for {0}", id);
+
             if (m_Cache != null)
                 return m_Cache.Get(id);
 

OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.cs

@@ -171,6 +171,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
         {
             return m_GridUserService.GetGridUserInfo(userID);
         }
+        public GridUserInfo[] GetGridUserInfo(string[] userID)
+        {
+            return m_GridUserService.GetGridUserInfo(userID);
+        }
 
         #endregion
 

OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/RemoteGridUserServiceConnector.cs

@@ -147,6 +147,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
             return m_RemoteConnector.GetGridUserInfo(userID);
         }
 
+        public GridUserInfo[] GetGridUserInfo(string[] userID)
+        {
+            return m_RemoteConnector.GetGridUserInfo(userID);
+        }
+
         #endregion
 
     }

OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs

@@ -1,223 +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;
-using Nini.Config;
-using log4net;
-using OpenSim.Framework;
-using OpenSim.Services.Interfaces;
-
-namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
-{
-    public abstract class BaseInventoryConnector : IInventoryService
-    {
-        protected static InventoryCache m_cache;
-        private static bool m_Initialized;
-
-        protected virtual void Init(IConfigSource source)
-        {
-            if (!m_Initialized)
-            {
-                m_cache = new InventoryCache();
-                m_cache.Init(source, this);
-                m_Initialized = true;
-            }
-        }
-
-        /// <summary>
-        /// Create the entire inventory for a given user
-        /// </summary>
-        /// <param name="user"></param>
-        /// <returns></returns>
-        public abstract bool CreateUserInventory(UUID user);
-
-        /// <summary>
-        /// Gets the skeleton of the inventory -- folders only
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <returns></returns>
-        public abstract List<InventoryFolderBase> GetInventorySkeleton(UUID userId);
-
-        /// <summary>
-        /// Synchronous inventory fetch.
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <returns></returns>
-        public abstract InventoryCollection GetUserInventory(UUID userID);
-
-        /// <summary>
-        /// Request the inventory for a user.  This is an asynchronous operation that will call the callback when the
-        /// inventory has been received
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <param name="callback"></param>
-        public abstract void GetUserInventory(UUID userID, InventoryReceiptCallback callback);
-
-        /// <summary>
-        /// Retrieve the root inventory folder for the given user.
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <returns>null if no root folder was found</returns>
-        public InventoryFolderBase GetRootFolder(UUID userID)
-        {
-            // Root folder is here as system type Folder.
-            return m_cache.GetFolderForType(userID, AssetType.Folder);
-        }
-
-        public abstract Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(UUID userID);
-
-        /// <summary>
-        /// Gets the user folder for the given folder-type
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
-        {
-            return m_cache.GetFolderForType(userID, type);
-        }
-
-        /// <summary>
-        /// Gets everything (folders and items) inside a folder
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <param name="folderID"></param>
-        /// <returns></returns>
-        public abstract InventoryCollection GetFolderContent(UUID userID, UUID folderID);
-
-        /// <summary>
-        /// Gets the items inside a folder
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <param name="folderID"></param>
-        /// <returns></returns>
-        public abstract List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID);
-
-        /// <summary>
-        /// Add a new folder to the user's inventory
-        /// </summary>
-        /// <param name="folder"></param>
-        /// <returns>true if the folder was successfully added</returns>
-        public abstract bool AddFolder(InventoryFolderBase folder);
-
-        /// <summary>
-        /// Update a folder in the user's inventory
-        /// </summary>
-        /// <param name="folder"></param>
-        /// <returns>true if the folder was successfully updated</returns>
-        public abstract bool UpdateFolder(InventoryFolderBase folder);
-
-        /// <summary>
-        /// Move an inventory folder to a new location
-        /// </summary>
-        /// <param name="folder">A folder containing the details of the new location</param>
-        /// <returns>true if the folder was successfully moved</returns>
-        public abstract bool MoveFolder(InventoryFolderBase folder);
-
-        /// <summary>
-        /// Delete a list of inventory folders (from trash)
-        /// </summary>
-        public abstract bool DeleteFolders(UUID ownerID, List<UUID> folderIDs);
-        
-        /// <summary>
-        /// Purge an inventory folder of all its items and subfolders.
-        /// </summary>
-        /// <param name="folder"></param>
-        /// <returns>true if the folder was successfully purged</returns>
-        public abstract bool PurgeFolder(InventoryFolderBase folder);
-
-        /// <summary>
-        /// Add a new item to the user's inventory.
-        /// If the given item has to parent folder, it tries to find the most
-        /// suitable folder for it.
-        /// </summary>
-        /// <param name="item"></param>
-        /// <returns>true if the item was successfully added</returns>
-        public bool AddItem(InventoryItemBase item)
-        {
-            if (item == null)
-                return false;
-
-            if (item.Folder == UUID.Zero)
-            {
-                InventoryFolderBase f = GetFolderForType(item.Owner, (AssetType)item.AssetType);
-                if (f != null)
-                    item.Folder = f.ID;
-                else
-                {
-                    f = GetRootFolder(item.Owner);
-                    if (f != null)
-                        item.Folder = f.ID;
-                    else
-                        return false;
-                }
-            }
-
-            return AddItemPlain(item);
-        }
-
-        protected abstract bool AddItemPlain(InventoryItemBase item);
-
-        /// <summary>
-        /// Update an item in the user's inventory
-        /// </summary>
-        /// <param name="item"></param>
-        /// <returns>true if the item was successfully updated</returns>
-        public abstract bool UpdateItem(InventoryItemBase item);
-
-        public abstract bool MoveItems(UUID ownerID, List<InventoryItemBase> items);
-
-        /// <summary>
-        /// Delete an item from the user's inventory
-        /// </summary>
-        /// <param name="item"></param>
-        /// <returns>true if the item was successfully deleted</returns>
-        public abstract bool DeleteItems(UUID ownerID, List<UUID> itemIDs);
-
-        public abstract InventoryItemBase GetItem(InventoryItemBase item);
-
-        public abstract InventoryFolderBase GetFolder(InventoryFolderBase folder);
-
-        /// <summary>
-        /// Does the given user have an inventory structure?
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <returns></returns>
-        public abstract bool HasInventoryForUser(UUID userID);
-
-        /// <summary>
-        /// Get the active gestures of the agent.
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <returns></returns>
-        public abstract List<InventoryItemBase> GetActiveGestures(UUID userId);
-
-        public abstract int GetAssetPermissions(UUID userID, UUID assetID);
-    }
-}

OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs

@@ -218,9 +218,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         /// <param name="userID"></param>
         private void CacheInventoryServiceURL(UUID userID)
         {
-            if (m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, userID) == null)
+            if (UserManagementModule != null && !UserManagementModule.IsLocalGridUser(userID))
             {
-                // The user does not have a local account; let's cache its service URL
+                // The user is not local; let's cache its service URL
                 string inventoryURL = string.Empty;
                 ScenePresence sp = null;
                 foreach (Scene scene in m_Scenes)

OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs

@@ -1,237 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-
-using OpenSim.Framework;
-using OpenSim.Framework.Client;
-using OpenSim.Region.Framework.Scenes;
-
-using OpenMetaverse;
-using Nini.Config;
-using log4net;
-
-namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
-{
-    public class InventoryCache
-    {
-        private static readonly ILog m_log =
-            LogManager.GetLogger(
-            MethodBase.GetCurrentMethod().DeclaringType);
-
-        protected BaseInventoryConnector m_Connector;
-        protected List<Scene> m_Scenes;
-
-        // The cache proper
-        protected Dictionary<UUID, Dictionary<AssetType, InventoryFolderBase>> m_InventoryCache;
-
-        // A cache of userIDs --> ServiceURLs, for HGBroker only
-        protected Dictionary<UUID, string> m_InventoryURLs =
-                new Dictionary<UUID, string>();
-
-        public virtual void Init(IConfigSource source, BaseInventoryConnector connector)
-        {
-            m_Scenes = new List<Scene>();
-            m_InventoryCache = new Dictionary<UUID, Dictionary<AssetType, InventoryFolderBase>>();
-            m_Connector = connector;
-        }
-
-        public virtual void AddRegion(Scene scene)
-        {
-            m_Scenes.Add(scene);
-            scene.EventManager.OnMakeRootAgent += OnMakeRootAgent;
-            scene.EventManager.OnClientClosed += OnClientClosed;
-        }
-
-        public virtual void RemoveRegion(Scene scene)
-        {
-            if ((m_Scenes != null) && m_Scenes.Contains(scene))
-            {
-                m_Scenes.Remove(scene);
-            }
-        }
-
-        void OnMakeRootAgent(ScenePresence presence)
-        {
-            // Get system folders
-
-            // First check if they're here already
-            lock (m_InventoryCache)
-            {
-                if (m_InventoryCache.ContainsKey(presence.UUID))
-                {
-                    m_log.DebugFormat("[INVENTORY CACHE]: OnMakeRootAgent, system folders for {0} {1} already in cache", presence.Firstname, presence.Lastname);
-                    return;
-                }
-            }
-
-            // If not, go get them and place them in the cache
-            Dictionary<AssetType, InventoryFolderBase> folders = CacheSystemFolders(presence.UUID);
-            CacheInventoryServiceURL(presence.Scene, presence.UUID);
-            
-            m_log.DebugFormat("[INVENTORY CACHE]: OnMakeRootAgent in {0}, fetched system folders for {1} {2}: count {3}", 
-                presence.Scene.RegionInfo.RegionName, presence.Firstname, presence.Lastname, folders.Count);
-
-        }
-
-        void OnClientClosed(UUID clientID, Scene scene)
-        {
-            if (m_InventoryCache.ContainsKey(clientID)) // if it's still in cache
-            {
-                ScenePresence sp = null;
-                foreach (Scene s in m_Scenes)
-                {
-                    s.TryGetScenePresence(clientID, out sp);
-                    if ((sp != null) && !sp.IsChildAgent && (s != scene))
-                    {
-                        m_log.DebugFormat("[INVENTORY CACHE]: OnClientClosed in {0}, but user {1} still in sim. Keeping system folders in cache",
-                            scene.RegionInfo.RegionName, clientID);
-                        return;
-                    }
-                }
-
-                m_log.DebugFormat(
-                    "[INVENTORY CACHE]: OnClientClosed in {0}, user {1} out of sim. Dropping system folders",
-                    scene.RegionInfo.RegionName, clientID);
-                DropCachedSystemFolders(clientID);
-                DropInventoryServiceURL(clientID);
-            }
-        }
-
-        /// <summary>
-        /// Cache a user's 'system' folders.
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <returns>Folders cached</returns>
-        protected Dictionary<AssetType, InventoryFolderBase> CacheSystemFolders(UUID userID)
-        {
-            // If not, go get them and place them in the cache
-            Dictionary<AssetType, InventoryFolderBase> folders = m_Connector.GetSystemFolders(userID);
-
-            if (folders.Count > 0)
-                lock (m_InventoryCache)
-                    m_InventoryCache.Add(userID, folders);
-
-            return folders;
-        }
-
-        /// <summary>
-        /// Drop a user's cached 'system' folders
-        /// </summary>
-        /// <param name="userID"></param>
-        protected void DropCachedSystemFolders(UUID userID)
-        {
-            // Drop system folders
-            lock (m_InventoryCache)
-                if (m_InventoryCache.ContainsKey(userID))
-                    m_InventoryCache.Remove(userID);
-        }
-
-        /// <summary>
-        /// Get the system folder for a particular asset type
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
-        {
-            m_log.DebugFormat("[INVENTORY CACHE]: Getting folder for asset type {0} for user {1}", type, userID);
-            
-            Dictionary<AssetType, InventoryFolderBase> folders = null;
-            
-            lock (m_InventoryCache)
-            {
-                m_InventoryCache.TryGetValue(userID, out folders);
-
-                // In some situations (such as non-secured standalones), system folders can be requested without
-                // the user being logged in.  So we need to try caching them here if we don't already have them.
-                if (null == folders)
-                    CacheSystemFolders(userID);
-
-                m_InventoryCache.TryGetValue(userID, out folders);
-            }
-            
-            if ((folders != null) && folders.ContainsKey(type))
-            {
-                m_log.DebugFormat(
-                    "[INVENTORY CACHE]: Returning folder {0} as type {1} for {2}", folders[type], type, userID);
-                
-                return folders[type];
-            }
-            
-            m_log.WarnFormat("[INVENTORY CACHE]: Could not find folder for system type {0} for {1}", type, userID);
-
-            return null;
-        }
-
-        /// <summary>
-        /// Gets the user's inventory URL from its serviceURLs, if the user is foreign,
-        /// and sticks it in the cache
-        /// </summary>
-        /// <param name="userID"></param>
-        private void CacheInventoryServiceURL(Scene scene, UUID userID)
-        {
-            if (scene.UserAccountService.GetUserAccount(scene.RegionInfo.ScopeID, userID) == null)
-            {
-                // The user does not have a local account; let's cache its service URL
-                string inventoryURL = string.Empty;
-                ScenePresence sp = null;
-                scene.TryGetScenePresence(userID, out sp);
-                if (sp != null)
-                {
-                    AgentCircuitData aCircuit = scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
-                    if (aCircuit.ServiceURLs.ContainsKey("InventoryServerURI"))
-                    {
-                        inventoryURL = aCircuit.ServiceURLs["InventoryServerURI"].ToString();
-                        if (inventoryURL != null && inventoryURL != string.Empty)
-                        {
-                            inventoryURL = inventoryURL.Trim(new char[] { '/' });
-                            m_InventoryURLs.Add(userID, inventoryURL);
-                        }
-                    }
-                }
-            }
-        }
-
-        private void DropInventoryServiceURL(UUID userID)
-        {
-            lock (m_InventoryURLs)
-                if (m_InventoryURLs.ContainsKey(userID))
-                    m_InventoryURLs.Remove(userID);
-        }
-
-        public string GetInventoryServiceURL(UUID userID)
-        {
-            if (m_InventoryURLs.ContainsKey(userID))
-                return m_InventoryURLs[userID];
-
-            return null;
-        }
-    }
-}

OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs

@@ -116,6 +116,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             m_merge = merge;
             m_skipAssets = skipAssets;
             m_requestId = requestId;
+
+            // Zero can never be a valid user id
+            m_validUserUuids[UUID.Zero] = false;
         }
 
         public ArchiveReadRequest(Scene scene, Stream loadStream, bool merge, bool skipAssets, Guid requestId)
@@ -125,6 +128,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             m_merge = merge;
             m_skipAssets = skipAssets;
             m_requestId = requestId;
+
+            // Zero can never be a valid user id
+            m_validUserUuids[UUID.Zero] = false;
         }
 
         /// <summary>
@@ -386,16 +392,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             if (!m_validUserUuids.ContainsKey(uuid))
             {
                 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, uuid);
-                if (account != null)
-                    m_validUserUuids.Add(uuid, true);
-                else
-                    m_validUserUuids.Add(uuid, false);
+                m_validUserUuids.Add(uuid, account != null);
             }
 
-            if (m_validUserUuids[uuid])
-                return true;
-            else
-                return false;
+            return m_validUserUuids[uuid];
         }
 
         /// <summary>
@@ -422,6 +422,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             string extension = filename.Substring(i);
             string uuid = filename.Remove(filename.Length - extension.Length);
 
+            if (m_scene.AssetService.GetMetadata(uuid) != null)
+            {
+                // m_log.DebugFormat("[ARCHIVER]: found existing asset {0}",uuid);
+                return true;
+            }
+
             if (ArchiveConstants.EXTENSION_TO_ASSET_TYPE.ContainsKey(extension))
             {
                 sbyte assetType = ArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension];

OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs

@@ -282,10 +282,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 // always (incorrectly) includes the Copy bit set in this case. But that's a mistake: the viewer
                 // does NOT show that the object has Everyone-Copy permissions, and doesn't allow it to be copied.
                 if (permissionClass != PermissionClass.Owner)
-                {
                     canTransfer |= (obj.EveryoneMask & (uint)PermissionMask.Copy) != 0;
-                }
-
 
                 bool partPermitted = true;
                 if (checkPermissions.Contains("C") && !canCopy)

OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs

@@ -98,6 +98,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             
             OptionSet options = new OptionSet().Add("m|merge", delegate (string v) { mergeOar = v != null; });
             options.Add("s|skip-assets", delegate (string v) { skipAssets = v != null; });
+
+            // Send a message to the region ready module
+            /* bluewall* Disable this for the time being
+            IRegionReadyModule rready = m_scene.RequestModuleInterface<IRegionReadyModule>();
+
+            if (rready != null)
+            {
+                rready.OarLoadingAlert("load");
+            }
+            */
             
             List<string> mainParams = options.Parse(cmdparams);
           
@@ -125,9 +135,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             Dictionary<string, object> options = new Dictionary<string, object>();
 
             OptionSet ops = new OptionSet();
-//            ops.Add("v|version=", delegate(string v) { options["version"] = v; });
-            ops.Add("p|profile=", delegate(string v) { options["profile"] = v; });
+
+            // legacy argument [obsolete]
+            ops.Add("p|profile=", delegate(string v) { Console.WriteLine("\n WARNING: -profile option is obsolete and it will not work. Use -home instead.\n"); });
+            // preferred
+            ops.Add("h|home=", delegate(string v) { options["home"] = v; });
+
             ops.Add("noassets", delegate(string v) { options["noassets"] = v != null; });
+            ops.Add("publish", v => options["wipe-owners"] = v != null);
             ops.Add("perm=", delegate(string v) { options["checkPermissions"] = v; });
 
             List<string> mainParams = ops.Parse(cmdparams);

OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs

@@ -306,10 +306,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
         protected AssetBase PostProcess(AssetBase asset)
         {
-            if (asset.Type == (sbyte)AssetType.Object && asset.Data != null && m_options.ContainsKey("profile"))
+            if (asset.Type == (sbyte)AssetType.Object && asset.Data != null && m_options.ContainsKey("home"))
             {
                 //m_log.DebugFormat("[ARCHIVER]: Rewriting object data for {0}", asset.ID);
-                string xml = ExternalRepresentationUtils.RewriteSOP(Utils.BytesToString(asset.Data), m_options["profile"].ToString(), m_userAccountService, m_scopeID);
+                string xml = ExternalRepresentationUtils.RewriteSOP(Utils.BytesToString(asset.Data), m_options["home"].ToString(), m_userAccountService, m_scopeID);
                 asset.Data = Utils.StringToBytes(xml);
             }
             return asset;

OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs

@@ -248,9 +248,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Dictionary<string, Object> options = new Dictionary<string, Object>();
             options.Add("noassets", true);
             m_archiverModule.ArchiveRegion(archiveWriteStream, requestId, options);
-            //AssetServerBase assetServer = (AssetServerBase)scene.CommsManager.AssetCache.AssetServer;
-            //while (assetServer.HasWaitingRequests())
-            //    assetServer.ProcessNextRequest();
 
             // Don't wait for completion - with --noassets save oar happens synchronously
 //                Monitor.Wait(this, 60000);
@@ -344,7 +341,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             {
                 using (BinaryReader br = new BinaryReader(resource))
                 {
-                    // FIXME: Use the inspector insteadthere are so many forums and lists already, though admittedly none of them are suitable for cross virtual-enivornemnt discussion
+                    // FIXME: Use the inspector instead
                     soundData = br.ReadBytes(99999999);
                     UUID soundUuid = UUID.Parse("00000000-0000-0000-0000-000000000001");
                     string soundAssetFileName 
@@ -409,6 +406,86 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Console.WriteLine("Successfully completed {0}", MethodBase.GetCurrentMethod());
         }
 
+        /// <summary>
+        /// Test loading an OpenSim Region Archive saved with the --publish option.
+        /// </summary>
+        [Test]
+        public void TestLoadPublishedOar()
+        {
+            TestHelpers.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+
+            SceneObjectPart part1 = CreateSceneObjectPart1();
+            SceneObjectGroup sog1 = new SceneObjectGroup(part1);
+            m_scene.AddNewSceneObject(sog1, false);
+
+            SceneObjectPart part2 = CreateSceneObjectPart2();
+            
+            AssetNotecard nc = new AssetNotecard();
+            nc.BodyText = "Hello World!";
+            nc.Encode();
+            UUID ncAssetUuid = new UUID("00000000-0000-0000-1000-000000000000");
+            UUID ncItemUuid = new UUID("00000000-0000-0000-1100-000000000000");
+            AssetBase ncAsset 
+                = AssetHelpers.CreateAsset(ncAssetUuid, AssetType.Notecard, nc.AssetData, UUID.Zero);
+            m_scene.AssetService.Store(ncAsset);
+            SceneObjectGroup sog2 = new SceneObjectGroup(part2);
+            TaskInventoryItem ncItem 
+                = new TaskInventoryItem { Name = "ncItem", AssetID = ncAssetUuid, ItemID = ncItemUuid };
+            part2.Inventory.AddInventoryItem(ncItem, true);
+            
+            m_scene.AddNewSceneObject(sog2, false);
+
+            MemoryStream archiveWriteStream = new MemoryStream();
+            m_scene.EventManager.OnOarFileSaved += SaveCompleted;
+
+            Guid requestId = new Guid("00000000-0000-0000-0000-808080808080");
+            
+            lock (this)
+            {
+                m_archiverModule.ArchiveRegion(
+                    archiveWriteStream, requestId, new Dictionary<string, Object>() { { "wipe-owners", Boolean.TrueString } });
+                
+                Monitor.Wait(this, 60000);
+            }
+            
+            Assert.That(m_lastRequestId, Is.EqualTo(requestId));
+
+            byte[] archive = archiveWriteStream.ToArray();
+            MemoryStream archiveReadStream = new MemoryStream(archive);
+
+            {
+                UUID estateOwner = TestHelpers.ParseTail(0x4747);
+                UUID objectOwner = TestHelpers.ParseTail(0x15);
+
+                // Reload to new scene
+                ArchiverModule archiverModule = new ArchiverModule();
+                SerialiserModule serialiserModule = new SerialiserModule();
+                TerrainModule terrainModule = new TerrainModule();
+
+                TestScene scene2 = SceneHelpers.SetupScene();
+                SceneHelpers.SetupSceneModules(scene2, archiverModule, serialiserModule, terrainModule);
+
+                // Make sure there's a valid owner for the owner we saved (this should have been wiped if the code is
+                // behaving correctly
+                UserAccountHelpers.CreateUserWithInventory(scene2, objectOwner);
+
+                scene2.RegionInfo.EstateSettings.EstateOwner = estateOwner;
+
+                lock (this)
+                {
+                    scene2.EventManager.OnOarFileLoaded += LoadCompleted;
+                    archiverModule.DearchiveRegion(archiveReadStream);
+                }
+
+                Assert.That(m_lastErrorMessage, Is.Null);
+
+                SceneObjectGroup loadedSog = scene2.GetSceneObjectGroup(part1.Name);
+                Assert.That(loadedSog.OwnerID, Is.EqualTo(estateOwner));
+                Assert.That(loadedSog.LastOwnerID, Is.EqualTo(estateOwner));
+            }
+        }
+
         /// <summary>
         /// Test loading the region settings of an OpenSim Region Archive.
         /// </summary>

OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs

@@ -55,6 +55,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
         protected EstateManagementCommands m_commands;                
 
         private EstateTerrainXferHandler TerrainUploader;
+        public TelehubManager m_Telehub;
 
         public event ChangeDelegate OnRegionInfoChange;
         public event ChangeDelegate OnEstateInfoChange;
@@ -70,7 +71,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         private void sendDetailedEstateData(IClientAPI remote_client, UUID invoice)
         {
-            m_log.DebugFormat("[ESTATE]: Invoice is {0}", invoice.ToString());
             uint sun = 0;
 
             if (!Scene.RegionInfo.EstateSettings.UseGlobalTime)
@@ -88,6 +88,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     GetEstateFlags(),
                     sun,
                     Scene.RegionInfo.RegionSettings.Covenant,
+                    (uint) Scene.RegionInfo.RegionSettings.CovenantChangedDateTime,
                     Scene.RegionInfo.EstateSettings.AbuseEmail,
                     estateOwner);
         }
@@ -256,6 +257,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
             IRestartModule restartModule = Scene.RequestModuleInterface<IRestartModule>();
             if (restartModule != null)
             {
+                if (timeInSeconds == -1)
+                {
+                    restartModule.AbortRestart("Restart aborted by region manager");
+                    return;
+                }
+
                 List<int> times = new List<int>();
                 while (timeInSeconds > 0)
                 {
@@ -279,6 +286,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
 //                remoteClient.Name, estateCovenantID);
             
             Scene.RegionInfo.RegionSettings.Covenant = estateCovenantID;
+            Scene.RegionInfo.RegionSettings.CovenantChangedDateTime = Util.UnixTimeSinceEpoch();
             Scene.RegionInfo.RegionSettings.Save();
             TriggerRegionInfoChange();
         }
@@ -615,6 +623,50 @@ namespace OpenSim.Region.CoreModules.World.Estate
             }
         }
 
+        public void handleOnEstateManageTelehub (IClientAPI client, UUID invoice, UUID senderID, string cmd, uint param1)
+        {
+            uint ObjectLocalID;
+            SceneObjectPart part;
+
+            switch (cmd)
+            {
+                case "info ui":
+                    break;
+
+                case "connect":
+                    // Add the Telehub
+                    part = Scene.GetSceneObjectPart((uint)param1);
+                    if (part == null)
+                        return;
+                    SceneObjectGroup grp = part.ParentGroup;
+
+                    m_Telehub.Connect(grp);
+                    break;
+
+                case "delete":
+                    // Disconnect Telehub
+                    m_Telehub.Disconnect();
+                    break;
+
+                case "spawnpoint add":
+                    // Add SpawnPoint to the Telehub
+                    part = Scene.GetSceneObjectPart((uint)param1);
+                    if (part == null)
+                        return;
+                    m_Telehub.AddSpawnPoint(part.AbsolutePosition);
+                    break;
+
+                case "spawnpoint remove":
+                    // Remove SpawnPoint from Telehub
+                    m_Telehub.RemoveSpawnPoint((int)param1);
+                    break;
+
+                default:
+                    break;
+            }
+            SendTelehubInfo(client);
+        }
+
         private void SendSimulatorBlueBoxMessage(
             IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message)
         {
@@ -1085,7 +1137,9 @@ namespace OpenSim.Region.CoreModules.World.Estate
             Scene.RegisterModuleInterface<IEstateModule>(this);
             Scene.EventManager.OnNewClient += EventManager_OnNewClient;
             Scene.EventManager.OnRequestChangeWaterHeight += changeWaterHeight;
-            
+
+            m_Telehub = new TelehubManager(scene);
+
             m_commands = new EstateManagementCommands(this);
             m_commands.Initialise();
         }
@@ -1139,6 +1193,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
             client.OnEstateRestartSimRequest += handleEstateRestartSimRequest;
             client.OnEstateChangeCovenantRequest += handleChangeEstateCovenantRequest;
             client.OnEstateChangeInfo += handleEstateChangeInfo;
+            client.OnEstateManageTelehub += handleOnEstateManageTelehub;
             client.OnUpdateEstateAccessDeltaRequest += handleEstateAccessDeltaRequest;
             client.OnSimulatorBlueBoxMessageRequest += SendSimulatorBlueBoxMessage;
             client.OnEstateBlueBoxMessageRequest += SendEstateBlueBoxMessage;
@@ -1293,5 +1348,39 @@ namespace OpenSim.Region.CoreModules.World.Estate
             if (onmessage != null)
                 onmessage(Scene.RegionInfo.RegionID, fromID, fromName, message);
         }
+
+
+        private void SendTelehubInfo(IClientAPI client)
+        {
+            RegionSettings settings =
+                    this.Scene.RegionInfo.RegionSettings;
+
+            SceneObjectGroup telehub = null;
+            if (settings.TelehubObject != UUID.Zero &&
+                (telehub = Scene.GetSceneObjectGroup(settings.TelehubObject)) != null)
+            {
+                List<Vector3> spawnPoints = new List<Vector3>();
+
+                foreach (SpawnPoint sp in settings.SpawnPoints())
+                {
+                    spawnPoints.Add(sp.GetLocation(Vector3.Zero, Quaternion.Identity));
+                }
+
+                client.SendTelehubInfo(settings.TelehubObject,
+                                       telehub.Name,
+                                       telehub.AbsolutePosition,
+                                       telehub.GroupRotation,
+                                       spawnPoints);
+            }
+            else
+            {
+                client.SendTelehubInfo(UUID.Zero,
+                                       String.Empty,
+                                       Vector3.Zero,
+                                       Quaternion.Identity,
+                                       new List<Vector3>());
+            }
+        }
     }
 }
+

OpenSim/Region/CoreModules/World/Estate/TelehubManager.cs

@@ -0,0 +1,95 @@
+/*
+ * 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.Reflection;
+using OpenMetaverse;
+using System.Collections.Generic;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
+using log4net;
+
+namespace OpenSim.Region.CoreModules.World.Estate
+{
+    public class TelehubManager
+    {
+        // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        Scene m_Scene;
+
+        public TelehubManager(Scene scene)
+        {
+            m_Scene = scene;
+        }
+
+        // Connect the Telehub
+        public void Connect(SceneObjectGroup grp)
+        {
+            m_Scene.RegionInfo.RegionSettings.ClearSpawnPoints();
+
+            m_Scene.RegionInfo.RegionSettings.TelehubObject = grp.UUID;
+            m_Scene.RegionInfo.RegionSettings.Save();
+        }
+
+        // Disconnect the Telehub:
+        public void Disconnect()
+        {
+            if (m_Scene.RegionInfo.RegionSettings.TelehubObject == UUID.Zero)
+                return;
+
+            m_Scene.RegionInfo.RegionSettings.TelehubObject = UUID.Zero;
+            m_Scene.RegionInfo.RegionSettings.ClearSpawnPoints();
+            m_Scene.RegionInfo.RegionSettings.Save();
+        }
+
+        // Add a SpawnPoint to the Telehub
+        public void AddSpawnPoint(Vector3 point)
+        {
+            if (m_Scene.RegionInfo.RegionSettings.TelehubObject == UUID.Zero)
+                return;
+
+            SceneObjectGroup grp = m_Scene.GetSceneObjectGroup(m_Scene.RegionInfo.RegionSettings.TelehubObject);
+            if (grp == null)
+                return;
+
+            SpawnPoint sp = new SpawnPoint();
+            sp.SetLocation(grp.AbsolutePosition, grp.GroupRotation, point);
+            m_Scene.RegionInfo.RegionSettings.AddSpawnPoint(sp);
+            m_Scene.RegionInfo.RegionSettings.Save();
+        }
+
+        // Remove a SpawnPoint from the Telehub
+        public void RemoveSpawnPoint(int spawnpoint)
+        {
+            if (m_Scene.RegionInfo.RegionSettings.TelehubObject == UUID.Zero)
+                return;
+
+            m_Scene.RegionInfo.RegionSettings.RemoveSpawnPoint(spawnpoint);
+            m_Scene.RegionInfo.RegionSettings.Save();
+        }
+    }
+}

OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs

@@ -205,6 +205,8 @@ namespace OpenSim.Region.CoreModules.World.Land
             client.OnParcelInfoRequest += ClientOnParcelInfoRequest;
             client.OnParcelDeedToGroup += ClientOnParcelDeedToGroup;
             client.OnPreAgentUpdate += ClientOnPreAgentUpdate;
+            client.OnParcelEjectUser += ClientOnParcelEjectUser;
+            client.OnParcelFreezeUser += ClientOnParcelFreezeUser;
 
             EntityBase presenceEntity;
             if (m_scene.Entities.TryGetValue(client.AgentId, out presenceEntity) && presenceEntity is ScenePresence)
@@ -506,7 +508,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void ClientOnParcelAccessListUpdateRequest(UUID agentID,
                 uint flags, int landLocalID, UUID transactionID, int sequenceID,
-                int sections, List<ParcelManager.ParcelAccessEntry> entries,
+                int sections, List<LandAccessEntry> entries,
                 IClientAPI remote_client)
         {
             // Flags is the list to update, it can mean either the ban or
@@ -1750,191 +1752,37 @@ namespace OpenSim.Region.CoreModules.World.Land
         public void ClientOnParcelEjectUser(IClientAPI client, UUID parcelowner, uint flags, UUID target)
         {
             ScenePresence targetAvatar = null;
-            ((Scene)client.Scene).TryGetScenePresence(target, out targetAvatar);
             ScenePresence parcelManager = null;
-            ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out parcelManager);
-            //Just eject
-            if (flags == 0)
-            {
-                if (targetAvatar.UserLevel == 0)
-                {
-                    ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
-                    if (!((Scene)client.Scene).Permissions.CanEditParcelProperties(client.AgentId, land, GroupPowers.LandEjectAndFreeze))
-                        return;
 
-                    Vector3 position = new Vector3(0, 0, 0);
-                    List<ILandObject> allParcels = new List<ILandObject>();
-                    allParcels = AllParcels();
-                    if (allParcels.Count != 1)
-                    {
-                        foreach (ILandObject parcel in allParcels)
-                        {
-                            if (parcel.LandData.GlobalID != land.LandData.GlobalID)
-                            {
-                                if (parcel.IsEitherBannedOrRestricted(targetAvatar.UUID) != true)
-                                {
-                                    for (int x = 1; x <= Constants.RegionSize; x += 2)
-                                    {
-                                        for (int y = 1; y <= Constants.RegionSize; y += 2)
-                                        {
-                                            if (parcel.ContainsPoint(x, y))
-                                            {
-                                                position = new Vector3(x, y, targetAvatar.AbsolutePosition.Z);
-                                                targetAvatar.TeleportWithMomentum(position);
-                                                targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
-                                                parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
-                                                return;
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    Vector3 targetVector;
-                    if (targetAvatar.AbsolutePosition.X > targetAvatar.AbsolutePosition.Y)
-                    {
-                        if (targetAvatar.AbsolutePosition.X > .5 * Constants.RegionSize)
-                        {
-                            targetVector = new Vector3(Constants.RegionSize, targetAvatar.AbsolutePosition.Y, targetAvatar.AbsolutePosition.Z); ;
-                            targetAvatar.TeleportWithMomentum(targetVector);
-                            targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
-                            parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
-                            return;
-                        }
-                        else
-                        {
-                            targetVector = new Vector3(0, targetAvatar.AbsolutePosition.Y, targetAvatar.AbsolutePosition.Z); ;
-                            targetAvatar.TeleportWithMomentum(targetVector);
-                            targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
-                            parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
-                            return;
-                        }
-                    }
-                    else
-                    {
-                        if (targetAvatar.AbsolutePosition.Y > .5 * Constants.RegionSize)
-                        {
-                            targetVector = new Vector3(targetAvatar.AbsolutePosition.X, Constants.RegionSize, targetAvatar.AbsolutePosition.Z); ;
-                            targetAvatar.TeleportWithMomentum(targetVector);
-                            targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
-                            parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
-                            return;
-                        }
-                        else
-                        {
-                            targetVector = new Vector3(targetAvatar.AbsolutePosition.X, 0, targetAvatar.AbsolutePosition.Z); ;
-                            targetAvatar.TeleportWithMomentum(targetVector);
-                            targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
-                            parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
-                            return;
-                        }
-                    }
-                }
-            }
-            //Eject and ban
-            if (flags == 1)
-            {
-                if (targetAvatar.UserLevel == 0)
-                {
-                    ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
-                    if (!((Scene)client.Scene).Permissions.CanEditParcelProperties(client.AgentId, land, GroupPowers.LandEjectAndFreeze))
-                        return;
+            // Must have presences
+            if (!m_scene.TryGetScenePresence(target, out targetAvatar) ||
+                !m_scene.TryGetScenePresence(client.AgentId, out parcelManager))
+                return;
 
-                    Vector3 position = new Vector3(0, 0, 0);
-                    List<ILandObject> allParcels = new List<ILandObject>();
-                    allParcels = AllParcels();
-                    if (allParcels.Count != 1)
-                    {
-                        foreach (ILandObject parcel in allParcels)
-                        {
-                            if (parcel.LandData.GlobalID != land.LandData.GlobalID)
-                            {
-                                if (parcel.IsEitherBannedOrRestricted(targetAvatar.UUID) != true)
-                                {
-                                    for (int x = 1; x <= Constants.RegionSize; x += 2)
-                                    {
-                                        for (int y = 1; y <= Constants.RegionSize; y += 2)
-                                        {
-                                            if (parcel.ContainsPoint(x, y))
-                                            {
-                                                position = new Vector3(x, y, targetAvatar.AbsolutePosition.Z);
-                                                targetAvatar.TeleportWithMomentum(position);
-                                                targetAvatar.ControllingClient.SendAlertMessage("You have been ejected and banned by " + parcelManager.Firstname + " " + parcelManager.Lastname);
-                                                parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected and Banned.");
-                                                ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
-                                                entry.AgentID = targetAvatar.UUID;
-                                                entry.Flags = AccessList.Ban;
-                                                entry.Time = new DateTime();
-                                                land.LandData.ParcelAccessList.Add(entry);
-                                                return;
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    Vector3 targetVector;
-                    if (targetAvatar.AbsolutePosition.X > targetAvatar.AbsolutePosition.Y)
-                    {
-                        if (targetAvatar.AbsolutePosition.X > .5 * Constants.RegionSize)
-                        {
-                            targetVector = new Vector3(Constants.RegionSize, targetAvatar.AbsolutePosition.Y, targetAvatar.AbsolutePosition.Z); ;
-                            targetAvatar.TeleportWithMomentum(targetVector);
-                            targetAvatar.ControllingClient.SendAlertMessage("You have been ejected and banned by " + parcelManager.Firstname + " " + parcelManager.Lastname);
-                            parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected and Banned.");
-                            ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
-                            entry.AgentID = targetAvatar.UUID;
-                            entry.Flags = AccessList.Ban;
-                            entry.Time = new DateTime();
-                            land.LandData.ParcelAccessList.Add(entry);
-                            return;
-                        }
-                        else
-                        {
-                            targetVector = new Vector3(0, targetAvatar.AbsolutePosition.Y, targetAvatar.AbsolutePosition.Z); ;
-                            targetAvatar.TeleportWithMomentum(targetVector);
-                            targetAvatar.ControllingClient.SendAlertMessage("You have been ejected and banned by " + parcelManager.Firstname + " " + parcelManager.Lastname);
-                            parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected and Banned.");
-                            ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
-                            entry.AgentID = targetAvatar.UUID;
-                            entry.Flags = AccessList.Ban;
-                            entry.Time = new DateTime();
-                            land.LandData.ParcelAccessList.Add(entry);
-                            return;
-                        }
-                    }
-                    else
-                    {
-                        if (targetAvatar.AbsolutePosition.Y > .5 * Constants.RegionSize)
-                        {
-                            targetVector = new Vector3(targetAvatar.AbsolutePosition.X, Constants.RegionSize, targetAvatar.AbsolutePosition.Z); ;
-                            targetAvatar.TeleportWithMomentum(targetVector);
-                            targetAvatar.ControllingClient.SendAlertMessage("You have been ejected and banned by " + parcelManager.Firstname + " " + parcelManager.Lastname);
-                            parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected and Banned.");
-                            ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
-                            entry.AgentID = targetAvatar.UUID;
-                            entry.Flags = AccessList.Ban;
-                            entry.Time = new DateTime();
-                            land.LandData.ParcelAccessList.Add(entry);
-                            return;
-                        }
-                        else
-                        {
-                            targetVector = new Vector3(targetAvatar.AbsolutePosition.X, 0, targetAvatar.AbsolutePosition.Z); ;
-                            targetAvatar.TeleportWithMomentum(targetVector);
-                            targetAvatar.ControllingClient.SendAlertMessage("You have been ejected and banned by " + parcelManager.Firstname + " " + parcelManager.Lastname);
-                            parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected and Banned.");
-                            ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
-                            entry.AgentID = targetAvatar.UUID;
-                            entry.Flags = AccessList.Ban;
-                            entry.Time = new DateTime();
-                            land.LandData.ParcelAccessList.Add(entry);
-                            return;
-                        }
-                    }
-                }
+            // Cannot eject estate managers or gods
+            if (m_scene.Permissions.IsAdministrator(target))
+                return;
+
+            // Check if you even have permission to do this
+            ILandObject land = m_scene.LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
+            if (!m_scene.Permissions.CanEditParcelProperties(client.AgentId, land, GroupPowers.LandEjectAndFreeze) &&
+                !m_scene.Permissions.IsAdministrator(client.AgentId))
+                return;
+
+            Vector3 pos = m_scene.GetNearestAllowedPosition(targetAvatar, land);
+
+            targetAvatar.TeleportWithMomentum(pos);
+            targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
+            parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
+            
+            if ((flags & 1) != 0) // Ban TODO: Remove magic number
+            {
+                LandAccessEntry entry = new LandAccessEntry();
+                entry.AgentID = targetAvatar.UUID;
+                entry.Flags = AccessList.Ban;
+                entry.Expires = 0; // Perm
+
+                land.LandData.ParcelAccessList.Add(entry);
             }
         }
         

OpenSim/Region/CoreModules/World/Land/LandObject.cs

@@ -190,10 +190,11 @@ namespace OpenSim.Region.CoreModules.World.Land
             else
             {
                 // Normal Calculations
-                int parcelMax = (int)((double)(LandData.Area
-                              * m_scene.RegionInfo.ObjectCapacity)
-                              * m_scene.RegionInfo.RegionSettings.ObjectBonus)
-                              / 65536;
+                int parcelMax = (int)((long)LandData.Area
+                              * (long)m_scene.RegionInfo.ObjectCapacity
+                              * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus
+                              / 65536L);
+                m_log.DebugFormat("Area: {0}, Capacity {1}, Bonus {2}, Parcel {3}", LandData.Area, m_scene.RegionInfo.ObjectCapacity, m_scene.RegionInfo.RegionSettings.ObjectBonus, parcelMax);
                 return parcelMax;
             }
         }
@@ -207,9 +208,9 @@ namespace OpenSim.Region.CoreModules.World.Land
             else
             {
                 // Normal Calculations
-                int parcelMax = LandData.Area
-                              * m_scene.RegionInfo.ObjectCapacity
-                              / 65536;
+                int parcelMax = (int)((long)LandData.Area
+                              * (long)m_scene.RegionInfo.ObjectCapacity
+                              / 65536L);
                 return parcelMax;
             }
         }
@@ -223,8 +224,9 @@ namespace OpenSim.Region.CoreModules.World.Land
             else
             {
                 //Normal Calculations
-                int simMax = (int)(((float)LandData.SimwideArea / 65536.0f)
-                           * (float)m_scene.RegionInfo.ObjectCapacity);
+                int simMax = (int)((long)LandData.SimwideArea
+                           * (long)m_scene.RegionInfo.ObjectCapacity / 65536L);
+                // m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}", LandData.SimwideArea, m_scene.RegionInfo.ObjectCapacity, simMax);
                 return simMax;
             }
         }
@@ -465,21 +467,26 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public bool IsBannedFromLand(UUID avatar)
         {
+            ExpireAccessList();
+
             if (m_scene.Permissions.IsAdministrator(avatar))
                 return false;
 
             if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar))
                 return false;
 
+            if (avatar == LandData.OwnerID)
+                return false;
+
             if ((LandData.Flags & (uint) ParcelFlags.UseBanList) > 0)
             {
                 if (LandData.ParcelAccessList.FindIndex(
-                        delegate(ParcelManager.ParcelAccessEntry e)
+                        delegate(LandAccessEntry e)
                         {
                             if (e.AgentID == avatar && e.Flags == AccessList.Ban)
                                 return true;
                             return false;
-                        }) != -1 && LandData.OwnerID != avatar)
+                        }) != -1)
                 {
                     return true;
                 }
@@ -489,21 +496,26 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public bool IsRestrictedFromLand(UUID avatar)
         {
+            ExpireAccessList();
+
             if (m_scene.Permissions.IsAdministrator(avatar))
                 return false;
 
             if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar))
                 return false;
 
+            if (avatar == LandData.OwnerID)
+                return false;
+
             if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) > 0)
             {
                 if (LandData.ParcelAccessList.FindIndex(
-                        delegate(ParcelManager.ParcelAccessEntry e)
+                        delegate(LandAccessEntry e)
                         {
                             if (e.AgentID == avatar && e.Flags == AccessList.Access)
                                 return true;
                             return false;
-                        }) == -1 && LandData.OwnerID != avatar)
+                        }) == -1)
                 {
                     if (!HasGroupAccess(avatar))
                     {
@@ -568,19 +580,24 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         #region AccessList Functions
 
-        public List<UUID>  CreateAccessListArrayByFlag(AccessList flag)
+        public List<LandAccessEntry>  CreateAccessListArrayByFlag(AccessList flag)
         {
-            List<UUID> list = new List<UUID>();
-            foreach (ParcelManager.ParcelAccessEntry entry in LandData.ParcelAccessList)
+            ExpireAccessList();
+
+            List<LandAccessEntry> list = new List<LandAccessEntry>();
+            foreach (LandAccessEntry entry in LandData.ParcelAccessList)
             {
                 if (entry.Flags == flag)
-                {
-                   list.Add(entry.AgentID);
-                }
+                   list.Add(entry);
             }
             if (list.Count == 0)
             {
-                list.Add(UUID.Zero);
+                LandAccessEntry e = new LandAccessEntry();
+                e.AgentID = UUID.Zero;
+                e.Flags = 0;
+                e.Expires = 0;
+
+                list.Add(e);
             }
 
             return list;
@@ -592,20 +609,20 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             if (flags == (uint) AccessList.Access || flags == (uint) AccessList.Both)
             {
-                List<UUID> avatars = CreateAccessListArrayByFlag(AccessList.Access);
-                remote_client.SendLandAccessListData(avatars,(uint) AccessList.Access,LandData.LocalID);
+                List<LandAccessEntry> accessEntries = CreateAccessListArrayByFlag(AccessList.Access);
+                remote_client.SendLandAccessListData(accessEntries,(uint) AccessList.Access,LandData.LocalID);
             }
 
             if (flags == (uint) AccessList.Ban || flags == (uint) AccessList.Both)
             {
-                List<UUID> avatars = CreateAccessListArrayByFlag(AccessList.Ban);
-                remote_client.SendLandAccessListData(avatars, (uint)AccessList.Ban, LandData.LocalID);
+                List<LandAccessEntry> accessEntries = CreateAccessListArrayByFlag(AccessList.Ban);
+                remote_client.SendLandAccessListData(accessEntries, (uint)AccessList.Ban, LandData.LocalID);
             }
         }
 
         public void UpdateAccessList(uint flags, UUID transactionID,
                 int sequenceID, int sections,
-                List<ParcelManager.ParcelAccessEntry> entries,
+                List<LandAccessEntry> entries,
                 IClientAPI remote_client)
         {
             LandData newData = LandData.Copy();
@@ -615,16 +632,16 @@ namespace OpenSim.Region.CoreModules.World.Land
             {
                 m_listTransactions[flags] = transactionID;
 
-                List<ParcelManager.ParcelAccessEntry> toRemove =
-                        new List<ParcelManager.ParcelAccessEntry>();
+                List<LandAccessEntry> toRemove =
+                        new List<LandAccessEntry>();
 
-                foreach (ParcelManager.ParcelAccessEntry entry in newData.ParcelAccessList)
+                foreach (LandAccessEntry entry in newData.ParcelAccessList)
                 {
                     if (entry.Flags == (AccessList)flags)
                         toRemove.Add(entry);
                 }
 
-                foreach (ParcelManager.ParcelAccessEntry entry in toRemove)
+                foreach (LandAccessEntry entry in toRemove)
                 {
                     newData.ParcelAccessList.Remove(entry);
                 }
@@ -639,13 +656,13 @@ namespace OpenSim.Region.CoreModules.World.Land
                 }
             }
 
-            foreach (ParcelManager.ParcelAccessEntry entry in entries)
+            foreach (LandAccessEntry entry in entries)
             {
-                ParcelManager.ParcelAccessEntry temp =
-                        new ParcelManager.ParcelAccessEntry();
+                LandAccessEntry temp =
+                        new LandAccessEntry();
 
                 temp.AgentID = entry.AgentID;
-                temp.Time = entry.Time;
+                temp.Expires = entry.Expires;
                 temp.Flags = (AccessList)flags;
 
                 newData.ParcelAccessList.Add(temp);
@@ -1151,7 +1168,32 @@ namespace OpenSim.Region.CoreModules.World.Land
             LandData.MusicURL = url;
             SendLandUpdateToAvatarsOverMe();
         }
-        
+
+        /// <summary>
+        /// Get the music url for this land parcel
+        /// </summary>
+        /// <returns>The music url.</returns>
+        public string GetMusicUrl()
+        {
+            return LandData.MusicURL;
+        }
+
         #endregion
+
+        private void ExpireAccessList()
+        {
+            List<LandAccessEntry> delete = new List<LandAccessEntry>();
+
+            foreach (LandAccessEntry entry in LandData.ParcelAccessList)
+            {
+                if (entry.Expires != 0 && entry.Expires < Util.UnixTimeSinceEpoch())
+                    delete.Add(entry);
+            }
+            foreach (LandAccessEntry entry in delete)
+                LandData.ParcelAccessList.Remove(entry);
+
+            if (delete.Count > 0)
+                m_scene.EventManager.TriggerLandObjectUpdated((uint)LandData.LocalID, this);
+        }
     }
 }

OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs

@@ -0,0 +1,410 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Statistics;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.CoreModules.World.Objects.Commands
+{
+    /// <summary>
+    /// A module that holds commands for manipulating objects in the scene.
+    /// </summary>
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ObjectCommandsModule")]
+    public class ObjectCommandsModule : INonSharedRegionModule
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);                
+
+        private Scene m_scene;
+        private ICommandConsole m_console;
+
+        public string Name { get { return "Object Commands Module"; } }
+        
+        public Type ReplaceableInterface { get { return null; } }
+        
+        public void Initialise(IConfigSource source)
+        {
+//            m_log.DebugFormat("[OBJECT COMMANDS MODULE]: INITIALIZED MODULE");
+        }
+        
+        public void PostInitialise()
+        {
+//            m_log.DebugFormat("[OBJECT COMMANDS MODULE]: POST INITIALIZED MODULE");
+        }
+        
+        public void Close()
+        {
+//            m_log.DebugFormat("[OBJECT COMMANDS MODULE]: CLOSED MODULE");
+        }
+        
+        public void AddRegion(Scene scene)
+        {
+//            m_log.DebugFormat("[OBJECT COMMANDS MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
+
+            m_scene = scene;
+            m_console = MainConsole.Instance;
+
+            m_console.Commands.AddCommand("region", false, "delete object owner",
+                                          "delete object owner <UUID>",
+                                          "Delete a scene object by owner", HandleDeleteObject);
+            m_console.Commands.AddCommand("region", false, "delete object creator",
+                                          "delete object creator <UUID>",
+                                          "Delete a scene object by creator", HandleDeleteObject);
+            m_console.Commands.AddCommand("region", false, "delete object uuid",
+                                          "delete object uuid <UUID>",
+                                          "Delete a scene object by uuid", HandleDeleteObject);
+            m_console.Commands.AddCommand("region", false, "delete object name",
+                                          "delete object name <name>",
+                                          "Delete a scene object by name", HandleDeleteObject);
+            m_console.Commands.AddCommand("region", false, "delete object outside",
+                                          "delete object outside",
+                                          "Delete all scene objects outside region boundaries", HandleDeleteObject);
+
+            m_console.Commands.AddCommand(
+                "region",
+                false,
+                "show object uuid",
+                "show object uuid <UUID>",
+                "Show details of a scene object with the given UUID", HandleShowObjectByUuid);
+
+            m_console.Commands.AddCommand(
+                "region",
+                false,
+                "show object name",
+                "show object name <name>",
+                "Show details of scene objects with the given name", HandleShowObjectByName);
+
+            m_console.Commands.AddCommand(
+                "region",
+                false,
+                "show part uuid",
+                "show part uuid <UUID>",
+                "Show details of a scene object parts with the given UUID", HandleShowPartByUuid);
+
+            m_console.Commands.AddCommand(
+                "region",
+                false,
+                "show part name",
+                "show part name <name>",
+                "Show details of scene object parts with the given name", HandleShowPartByName);
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+//            m_log.DebugFormat("[OBJECTS COMMANDS MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+//            m_log.DebugFormat("[OBJECTS COMMANDS MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
+        }
+
+        private void HandleShowObjectByUuid(string module, string[] cmd)
+        {
+            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
+                return;
+
+            if (cmd.Length < 4)
+            {
+                m_console.OutputFormat("Usage: show object uuid <uuid>");
+                return;
+            }
+
+            UUID objectUuid;
+            if (!UUID.TryParse(cmd[3], out objectUuid))
+            {
+                m_console.OutputFormat("{0} is not a valid uuid", cmd[3]);
+                return;
+            }
+
+            SceneObjectGroup so = m_scene.GetSceneObjectGroup(objectUuid);
+
+            if (so == null)
+            {
+//                m_console.OutputFormat("No part found with uuid {0}", objectUuid);
+                return;
+            }
+
+            StringBuilder sb = new StringBuilder();
+            AddSceneObjectReport(sb, so);
+
+            m_console.OutputFormat(sb.ToString());
+        }
+
+        private void HandleShowObjectByName(string module, string[] cmd)
+        {
+            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
+                return;
+
+            if (cmd.Length < 4)
+            {
+                m_console.OutputFormat("Usage: show object name <name>");
+                return;
+            }
+
+            string name = cmd[3];
+
+            List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
+
+            m_scene.ForEachSOG(so => { if (so.Name == name) { sceneObjects.Add(so); }});
+
+            if (sceneObjects.Count == 0)
+            {
+                m_console.OutputFormat("No objects with name {0} found in {1}", name, m_scene.RegionInfo.RegionName);
+                return;
+            }
+
+            StringBuilder sb = new StringBuilder();
+
+            foreach (SceneObjectGroup so in sceneObjects)
+            {
+                AddSceneObjectReport(sb, so);
+                sb.Append("\n");
+            }
+
+            m_console.OutputFormat(sb.ToString());
+        }
+
+        private void HandleShowPartByUuid(string module, string[] cmd)
+        {
+            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
+                return;
+
+            if (cmd.Length < 4)
+            {
+                m_console.OutputFormat("Usage: show part uuid <uuid>");
+                return;
+            }
+
+            UUID objectUuid;
+            if (!UUID.TryParse(cmd[3], out objectUuid))
+            {
+                m_console.OutputFormat("{0} is not a valid uuid", cmd[3]);
+                return;
+            }
+
+            SceneObjectPart sop = m_scene.GetSceneObjectPart(objectUuid);
+
+            if (sop == null)
+            {
+//                m_console.OutputFormat("No part found with uuid {0}", objectUuid);
+                return;
+            }
+
+            StringBuilder sb = new StringBuilder();
+            AddScenePartReport(sb, sop);
+
+            m_console.OutputFormat(sb.ToString());
+        }
+
+        private void HandleShowPartByName(string module, string[] cmd)
+        {
+            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
+                return;
+
+            if (cmd.Length < 4)
+            {
+                m_console.OutputFormat("Usage: show part name <name>");
+                return;
+            }
+
+            string name = cmd[3];
+
+            List<SceneObjectPart> parts = new List<SceneObjectPart>();
+
+            m_scene.ForEachSOG(so => so.ForEachPart(sop => { if (sop.Name == name) { parts.Add(sop); } }));
+
+            if (parts.Count == 0)
+            {
+                m_console.OutputFormat("No parts with name {0} found in {1}", name, m_scene.RegionInfo.RegionName);
+                return;
+            }
+
+            StringBuilder sb = new StringBuilder();
+
+            foreach (SceneObjectPart part in parts)
+            {
+                AddScenePartReport(sb, part);
+                sb.Append("\n");
+            }
+
+            m_console.OutputFormat(sb.ToString());
+        }
+
+        private StringBuilder AddSceneObjectReport(StringBuilder sb, SceneObjectGroup so)
+        {
+            sb.AppendFormat("Name:        {0}\n", so.Name);
+            sb.AppendFormat("Description: {0}\n", so.Description);
+            sb.AppendFormat("Location:    {0} @ {1}\n", so.AbsolutePosition, so.Scene.RegionInfo.RegionName);
+            sb.AppendFormat("Parts:       {0}\n", so.PrimCount);
+
+            return sb;
+        }
+
+        private StringBuilder AddScenePartReport(StringBuilder sb, SceneObjectPart sop)
+        {
+            sb.AppendFormat("Name:        {0}\n", sop.Name);
+            sb.AppendFormat("Description: {0}\n", sop.Description);
+            sb.AppendFormat("Location:    {0} @ {1}\n", sop.AbsolutePosition, sop.ParentGroup.Scene.RegionInfo.RegionName);
+            sb.AppendFormat("Parent:      {0}",
+                sop.IsRoot ? "Is Root\n" : string.Format("{0} {1}\n", sop.ParentGroup.Name, sop.ParentGroup.UUID));
+            sb.AppendFormat("Parts:       {0}\n", !sop.IsRoot ? "1" : sop.ParentGroup.PrimCount.ToString());;
+
+            return sb;
+        }
+
+        private void HandleDeleteObject(string module, string[] cmd)
+        {
+            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
+                return;
+
+            if (cmd.Length < 3)
+                return;
+
+            string mode = cmd[2];
+            string o = "";
+
+            if (mode != "outside")
+            {
+                if (cmd.Length < 4)
+                    return;
+
+                o = cmd[3];
+            }
+
+            List<SceneObjectGroup> deletes = new List<SceneObjectGroup>();
+
+            UUID match;
+
+            switch (mode)
+            {
+            case "owner":
+                if (!UUID.TryParse(o, out match))
+                    return;
+
+                m_scene.ForEachSOG(delegate (SceneObjectGroup g)
+                {
+                    if (g.OwnerID == match && !g.IsAttachment)
+                        deletes.Add(g);
+                });
+
+//                if (deletes.Count == 0)
+//                    m_console.OutputFormat("No objects were found with owner {0}", match);
+
+                break;
+
+            case "creator":
+                if (!UUID.TryParse(o, out match))
+                    return;
+
+                m_scene.ForEachSOG(delegate (SceneObjectGroup g)
+                {
+                    if (g.RootPart.CreatorID == match && !g.IsAttachment)
+                        deletes.Add(g);
+                });
+
+//                if (deletes.Count == 0)
+//                    m_console.OutputFormat("No objects were found with creator {0}", match);
+
+                break;
+
+            case "uuid":
+                if (!UUID.TryParse(o, out match))
+                    return;
+
+                m_scene.ForEachSOG(delegate (SceneObjectGroup g)
+                {
+                    if (g.UUID == match && !g.IsAttachment)
+                        deletes.Add(g);
+                });
+
+//                if (deletes.Count == 0)
+//                    m_console.OutputFormat("No objects were found with uuid {0}", match);
+
+                break;
+
+            case "name":
+                m_scene.ForEachSOG(delegate (SceneObjectGroup g)
+                {
+                    if (g.RootPart.Name == o && !g.IsAttachment)
+                        deletes.Add(g);
+                });
+
+//                if (deletes.Count == 0)
+//                    m_console.OutputFormat("No objects were found with name {0}", o);
+
+                break;
+
+            case "outside":
+                m_scene.ForEachSOG(delegate (SceneObjectGroup g)
+                {
+                    SceneObjectPart rootPart = g.RootPart;
+                    bool delete = false;
+
+                    if (rootPart.GroupPosition.Z < 0.0 || rootPart.GroupPosition.Z > 10000.0)
+                    {
+                        delete = true;
+                    }
+                    else
+                    {
+                        ILandObject parcel
+                            = m_scene.LandChannel.GetLandObject(rootPart.GroupPosition.X, rootPart.GroupPosition.Y);
+
+                        if (parcel == null || parcel.LandData.Name == "NO LAND")
+                            delete = true;
+                    }
+
+                    if (delete && !g.IsAttachment && !deletes.Contains(g))
+                        deletes.Add(g);
+                });
+
+//                if (deletes.Count == 0)
+//                    m_console.OutputFormat("No objects were found outside region bounds");
+
+                break;
+            }
+
+            m_console.OutputFormat("Deleting {0} objects in {1}", deletes.Count, m_scene.RegionInfo.RegionName);
+
+            foreach (SceneObjectGroup g in deletes)
+            {
+                m_console.OutputFormat("Deleting object {0} {1}", g.UUID, g.Name);
+                m_scene.DeleteSceneObject(g, false);
+            }
+        }
+    }
+}

OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs

@@ -384,9 +384,15 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             if (m_debugPermissions)
                 m_log.Debug("[PERMISSIONS]: " + permissionCalled + " was called from " + m_scene.RegionInfo.RegionName);
         }
-    
-        // Checks if the given group is active and if the user is a group member
-        // with the powers requested (powers = 0 for no powers check)
+
+        /// <summary>
+        /// Checks if the given group is active and if the user is a group member
+        /// with the powers requested (powers = 0 for no powers check)
+        /// </summary>
+        /// <param name="groupID"></param>
+        /// <param name="userID"></param>
+        /// <param name="powers"></param>
+        /// <returns></returns>
         protected bool IsGroupMember(UUID groupID, UUID userID, ulong powers)
         {
             if (null == m_groupsModule)

OpenSim/Region/CoreModules/World/Region/RestartModule.cs

@@ -240,6 +240,9 @@ namespace OpenSim.Region.CoreModules.World.Region
                 if (m_DialogModule != null && message != String.Empty)
                     m_DialogModule.SendGeneralAlert(message);
             }
+           if (m_MarkerPath != String.Empty)
+               File.Delete(Path.Combine(m_MarkerPath,
+                       m_Scene.RegionInfo.RegionID.ToString()));
         }
         
         private void HandleRegionRestart(string module, string[] args)

OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

@@ -213,7 +213,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                                       UUID agentID, Caps caps)
         {
             //try
-            //{
+            //
             //m_log.DebugFormat("[MAPLAYER]: path: {0}, param: {1}, agent:{2}",
             //                  path, param, agentID.ToString());
 
@@ -263,7 +263,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         foreach (GridRegion r in regions)
                         {
                             MapBlockData block = new MapBlockData();
-                            MapBlockFromGridRegion(block, r);
+                            MapBlockFromGridRegion(block, r, 0);
                             mapBlocks.Add(block);
                         }
                         avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0);
@@ -288,7 +288,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         /// <returns></returns>
         public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq)
         {
-            m_log.DebugFormat("[WORLD MAP]: MapLayer Request in region: {0}", m_scene.RegionInfo.RegionName);
+            // m_log.DebugFormat("[WORLD MAP]: MapLayer Request in region: {0}", m_scene.RegionInfo.RegionName);
             LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse();
             mapResponse.LayerData.Array.Add(GetOSDMapLayerResponse());
             return mapResponse;
@@ -373,7 +373,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         public virtual void HandleMapItemRequest(IClientAPI remoteClient, uint flags,
             uint EstateID, bool godlike, uint itemtype, ulong regionhandle)
         {
-//            m_log.DebugFormat("[WORLD MAP]: Handle MapItem request {0} {1}", regionhandle, itemtype);
+            // m_log.DebugFormat("[WORLD MAP]: Handle MapItem request {0} {1}", regionhandle, itemtype);
 
             lock (m_rootAgents)
             {
@@ -429,7 +429,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     // ensures that the blockingqueue doesn't get borked if the GetAgents() timing changes.
                     RequestMapItems("",remoteClient.AgentId,flags,EstateID,godlike,itemtype,regionhandle);
                 }
-            } else if (itemtype == 7) // Service 7 (MAP_ITEM_LAND_FOR_SALE)
+            }
+            else if (itemtype == 7) // Service 7 (MAP_ITEM_LAND_FOR_SALE)
             {
                 if (regionhandle == 0 || regionhandle == m_scene.RegionInfo.RegionHandle)
                 {
@@ -463,7 +464,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                                 mapitem.x = (uint)(xstart + x);
                                 mapitem.y = (uint)(ystart + y);
                                 // mapitem.z = (uint)m_scene.GetGroundHeight(x,y);
-                                mapitem.id = UUID.Zero;
+                                mapitem.id = parcel.GlobalID;
                                 mapitem.name = parcel.Name;
                                 mapitem.Extra = parcel.Area;
                                 mapitem.Extra2 = parcel.SalePrice;
@@ -481,6 +482,34 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     RequestMapItems("",remoteClient.AgentId,flags,EstateID,godlike,itemtype,regionhandle);
                 }
             }
+            else if (itemtype == 1) // Service 1 (MAP_ITEM_TELEHUB)
+            {
+                if (regionhandle == 0 || regionhandle == m_scene.RegionInfo.RegionHandle)
+                {
+                    List<mapItemReply> mapitems = new List<mapItemReply>();
+                    mapItemReply mapitem = new mapItemReply();
+
+                    SceneObjectGroup sog = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject);
+                    if (sog != null)
+                    {
+                        mapitem = new mapItemReply();
+                        mapitem.x = (uint)(xstart + sog.AbsolutePosition.X);
+                        mapitem.y = (uint)(ystart + sog.AbsolutePosition.Y);
+                        mapitem.id = UUID.Zero;
+                        mapitem.name = sog.Name;
+                        mapitem.Extra = 0; // color (not used)
+                        mapitem.Extra2 = 0; // 0 = telehub / 1 = infohub
+                        mapitems.Add(mapitem);
+
+                        remoteClient.SendMapItemReply(mapitems.ToArray(), itemtype, flags);
+                    }
+                }
+                else
+                {
+                    // Remote Map Item Request
+                    RequestMapItems("",remoteClient.AgentId,flags,EstateID,godlike,itemtype,regionhandle);
+                }
+            }
         }
 
         private int nAsyncRequests = 0;
@@ -620,6 +649,28 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                             }
                             av.ControllingClient.SendMapItemReply(returnitems.ToArray(), itemtype, mrs.flags);
                         }
+
+                        // Service 1 (MAP_ITEM_TELEHUB)
+                        itemtype = 1;
+
+                        if (response.ContainsKey(itemtype.ToString()))
+                        {
+                            List<mapItemReply> returnitems = new List<mapItemReply>();
+                            OSDArray itemarray = (OSDArray)response[itemtype.ToString()];
+                            for (int i = 0; i < itemarray.Count; i++)
+                            {
+                                OSDMap mapitem = (OSDMap)itemarray[i];
+                                mapItemReply mi = new mapItemReply();
+                                mi.x = (uint)mapitem["X"].AsInteger();
+                                mi.y = (uint)mapitem["Y"].AsInteger();
+                                mi.id = mapitem["ID"].AsUUID();
+                                mi.Extra = mapitem["Extra"].AsInteger();
+                                mi.Extra2 = mapitem["Extra2"].AsInteger();
+                                mi.name = mapitem["Name"].AsString();
+                                returnitems.Add(mi);
+                            }
+                            av.ControllingClient.SendMapItemReply(returnitems.ToArray(), itemtype, mrs.flags);
+                        }
                     }
                 }
             }
@@ -904,8 +955,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             {
                 List<MapBlockData> response = new List<MapBlockData>();
 
-                // this should return one mapblock at most. 
-                // (diva note: why?? in that case we should GetRegionByPosition)
+                // this should return one mapblock at most. It is triggered by a click
+                // on an unloaded square.
                 // But make sure: Look whether the one we requested is in there
                 List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
                     minX * (int)Constants.RegionSize, 
@@ -922,7 +973,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         {
                             // found it => add it to response
                             MapBlockData block = new MapBlockData();
-                            MapBlockFromGridRegion(block, r);
+                            MapBlockFromGridRegion(block, r, flag);
                             response.Add(block);
                             break;
                         }
@@ -938,10 +989,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     block.Access = 254; // means 'simulator is offline'
                     response.Add(block);
                 }
-                if ((flag & 2) == 2) // V2 !!!
-                    remoteClient.SendMapBlock(response, 2);
-                else
-                    remoteClient.SendMapBlock(response, 0);
+                // The lower 16 bits are an unsigned int16
+                remoteClient.SendMapBlock(response, flag & 0xffff);
             }
             else
             {
@@ -961,21 +1010,29 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             foreach (GridRegion r in regions)
             {
                 MapBlockData block = new MapBlockData();
-                MapBlockFromGridRegion(block, r);
+                MapBlockFromGridRegion(block, r, flag);
                 mapBlocks.Add(block);
             }
-            if ((flag & 2) == 2) // V2 !!!
-                remoteClient.SendMapBlock(mapBlocks, 2);
-            else
-                remoteClient.SendMapBlock(mapBlocks, 0);
+            remoteClient.SendMapBlock(mapBlocks, flag & 0xffff);
 
             return mapBlocks;
         }
 
-        protected void MapBlockFromGridRegion(MapBlockData block, GridRegion r)
+        protected void MapBlockFromGridRegion(MapBlockData block, GridRegion r, uint flag)
         {
             block.Access = r.Access;
-            block.MapImageId = r.TerrainImage;
+            switch (flag & 0xffff)
+            {
+            case 0:
+                block.MapImageId = r.TerrainImage;
+                break;
+            case 2:
+                block.MapImageId = r.ParcelImage;
+                break;
+            default:
+                block.MapImageId = UUID.Zero;
+                break;
+            }
             block.Name = r.RegionName;
             block.X = (ushort)(r.RegionLocX / Constants.RegionSize);
             block.Y = (ushort)(r.RegionLocY / Constants.RegionSize);
@@ -1109,7 +1166,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             foreach (GridRegion r in regions)
             {
                 MapBlockData mapBlock = new MapBlockData();
-                MapBlockFromGridRegion(mapBlock, r);
+                MapBlockFromGridRegion(mapBlock, r, 0);
                 AssetBase texAsset = m_scene.AssetService.Get(mapBlock.MapImageId.ToString());
 
                 if (texAsset != null)
@@ -1240,7 +1297,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         responsemapdata["X"] = OSD.FromInteger((int)(xstart + x));
                         responsemapdata["Y"] = OSD.FromInteger((int)(ystart + y));
                         // responsemapdata["Z"] = OSD.FromInteger((int)m_scene.GetGroundHeight(x,y));
-                        responsemapdata["ID"] = OSD.FromUUID(UUID.Zero);
+                        responsemapdata["ID"] = OSD.FromUUID(parcel.GlobalID);
                         responsemapdata["Name"] = OSD.FromString(parcel.Name);
                         responsemapdata["Extra"] = OSD.FromInteger(parcel.Area);
                         responsemapdata["Extra2"] = OSD.FromInteger(parcel.SalePrice);
@@ -1250,6 +1307,26 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 responsemap["7"] = responsearr;
             }
 
+            if (m_scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero)
+            {
+                SceneObjectGroup sog = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject);
+                if (sog != null)
+                {
+                    OSDArray responsearr = new OSDArray();
+                    OSDMap responsemapdata = new OSDMap();
+                    responsemapdata["X"] = OSD.FromInteger((int)(xstart + sog.AbsolutePosition.X));
+                    responsemapdata["Y"] = OSD.FromInteger((int)(ystart + sog.AbsolutePosition.Y));
+                    // responsemapdata["Z"] = OSD.FromInteger((int)m_scene.GetGroundHeight(x,y));
+                    responsemapdata["ID"] = OSD.FromUUID(sog.UUID);
+                    responsemapdata["Name"] = OSD.FromString(sog.Name);
+                    responsemapdata["Extra"] = OSD.FromInteger(0); // color (unused)
+                    responsemapdata["Extra2"] = OSD.FromInteger(0); // 0 = telehub / 1 = infohub
+                    responsearr.Add(responsemapdata);
+
+                    responsemap["1"] = responsearr;
+                }
+            }
+
             return responsemap;
         }
 
@@ -1268,9 +1345,12 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             if (data == null)
                 return;
             
+            byte[] overlay = GenerateOverlay();
+
             m_log.Debug("[WORLDMAP]: STORING MAPTILE IMAGE");
 
             UUID terrainImageID = UUID.Random();
+            UUID parcelImageID = UUID.Zero;
 
             AssetBase asset = new AssetBase(
                 terrainImageID,
@@ -1286,14 +1366,35 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             m_log.DebugFormat("[WORLDMAP]: Storing map tile {0}", asset.ID);
             m_scene.AssetService.Store(asset);
             
+            if (overlay != null)
+            {
+                parcelImageID = UUID.Random();
+
+                AssetBase parcels = new AssetBase(
+                    parcelImageID,
+                    "parcelImage_" + m_scene.RegionInfo.RegionID.ToString(),
+                    (sbyte)AssetType.Texture,
+                    m_scene.RegionInfo.RegionID.ToString());
+                parcels.Data = overlay;
+                parcels.Description = m_scene.RegionInfo.RegionName;
+                parcels.Temporary = false;
+                parcels.Flags = AssetFlags.Maptile;
+
+                m_scene.AssetService.Store(parcels);
+            }
+
             // Switch to the new one
-            UUID lastMapRegionUUID = m_scene.RegionInfo.RegionSettings.TerrainImageID;
+            UUID lastTerrainImageID = m_scene.RegionInfo.RegionSettings.TerrainImageID;
+            UUID lastParcelImageID = m_scene.RegionInfo.RegionSettings.ParcelImageID;
             m_scene.RegionInfo.RegionSettings.TerrainImageID = terrainImageID;
+            m_scene.RegionInfo.RegionSettings.ParcelImageID = parcelImageID;
             m_scene.RegionInfo.RegionSettings.Save();
             
             // Delete the old one
-            m_log.DebugFormat("[WORLDMAP]: Deleting old map tile {0}", lastMapRegionUUID);
-            m_scene.AssetService.Delete(lastMapRegionUUID.ToString());
+            // m_log.DebugFormat("[WORLDMAP]: Deleting old map tile {0}", lastTerrainImageID);
+            m_scene.AssetService.Delete(lastTerrainImageID.ToString());
+            if (lastParcelImageID != UUID.Zero)
+                m_scene.AssetService.Delete(lastParcelImageID.ToString());
         }
 
         private void MakeRootAgent(ScenePresence avatar)
@@ -1339,6 +1440,92 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             }
         }
 
+        private Byte[] GenerateOverlay()
+        {
+            Bitmap overlay = new Bitmap(256, 256);
+
+            bool[,] saleBitmap = new bool[64, 64];
+            for (int x = 0 ; x < 64 ; x++)
+            {
+                for (int y = 0 ; y < 64 ; y++)
+                    saleBitmap[x, y] = false;
+            }
+
+            bool landForSale = false;
+
+            List<ILandObject> parcels = m_scene.LandChannel.AllParcels();
+
+            Color background = Color.FromArgb(0, 0, 0, 0);
+            SolidBrush transparent = new SolidBrush(background);
+            Graphics g = Graphics.FromImage(overlay);
+            g.FillRectangle(transparent, 0, 0, 255, 255);
+
+            SolidBrush yellow = new SolidBrush(Color.FromArgb(255, 249, 223, 9));
+            Pen grey = new Pen(Color.FromArgb(255, 92, 92, 92));
+
+            foreach (ILandObject land in parcels)
+            {
+                // m_log.DebugFormat("[WORLD MAP]: Parcel {0} flags {1}", land.LandData.Name, land.LandData.Flags);
+                if ((land.LandData.Flags & (uint)ParcelFlags.ForSale) != 0)
+                {
+                    landForSale = true;
+                    
+                    bool[,] landBitmap = land.GetLandBitmap();
+
+                    for (int x = 0 ; x < 64 ; x++)
+                    {
+                        for (int y = 0 ; y < 64 ; y++)
+                        {
+                            if (landBitmap[x, y])
+                            {
+                                g.FillRectangle(yellow, x * 4, 252 - (y * 4), 4, 4);
+
+                                if (x > 0)
+                                {
+                                    if ((saleBitmap[x - 1, y] || landBitmap[x - 1, y]) == false)
+                                        g.DrawLine(grey, x * 4, 252 - (y * 4), x * 4, 255 - (y * 4));
+                                }
+                                if (y > 0)
+                                {
+                                    if ((saleBitmap[x, y-1] || landBitmap[x, y-1]) == false)
+                                        g.DrawLine(grey, x * 4, 255 - (y * 4), x * 4 + 3, 255 - (y * 4));
+                                }
+                                if (x < 63)
+                                {
+                                    if ((saleBitmap[x + 1, y] || landBitmap[x + 1, y]) == false)
+                                        g.DrawLine(grey, x * 4 + 3, 252 - (y * 4), x * 4 + 3, 255 - (y * 4));
+                                }
+                                if (y < 63)
+                                {
+                                    if ((saleBitmap[x, y + 1] || landBitmap[x, y + 1]) == false)
+                                        g.DrawLine(grey, x * 4, 252 - (y * 4), x * 4 + 3, 252 - (y * 4));
+                                }
+                            }
+                        }
+                    }
+
+                    saleBitmap = land.MergeLandBitmaps(saleBitmap, landBitmap);
+                }
+            }
+
+            if (!landForSale)
+            {
+                m_log.DebugFormat("[WORLD MAP]: Region {0} has no parcels for sale, not geenrating overlay", m_scene.RegionInfo.RegionName);
+                return null;
+            }
+
+            m_log.DebugFormat("[WORLD MAP]: Region {0} has parcels for sale, genrating overlay", m_scene.RegionInfo.RegionName);
+
+            try
+            {
+                return OpenJPEG.EncodeFromImage(overlay, true);
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[WORLD MAP]: Error creating parcel overlay: " + e.ToString());
+            }
+            return null;
+        }
     }
 
     public struct MapRequestState

OpenSim/Region/DataSnapshot/DataRequestHandler.cs

@@ -67,7 +67,7 @@ namespace OpenSim.Region.DataSnapshot
 
         public void OnRegisterCaps(UUID agentID, Caps caps)
         {
-            m_log.Info("[DATASNAPSHOT]: Registering service discovery capability for " + agentID);
+//            m_log.InfoFormat("[DATASNAPSHOT]: Registering service discovery capability for {0}", agentID);
             string capsBase = "/CAPS/" + caps.CapsObjectPath;
             caps.RegisterHandler("PublicSnapshotDataInfo",
                 new RestStreamHandler("POST", capsBase + m_discoveryPath, OnDiscoveryAttempt));

OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs

@@ -47,7 +47,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// Save the attachments that have change on this presence.
         /// </summary>
         /// <param name="sp"></param>
-        void SaveChangedAttachments(IScenePresence sp);
+        void SaveChangedAttachments(IScenePresence sp, bool saveAllScripted);
 
         /// <summary>
         /// Delete all the presence's attachments from the scene

OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs

@@ -31,9 +31,10 @@ using OpenSim.Framework;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
+    public delegate void ReportOutputAction(string format, params object[] args);
+
     public interface IAvatarFactoryModule
     {
-
         void SetAppearance(IScenePresence sp, Primitive.TextureEntry textureEntry, byte[] visualParams);
 
         /// <summary>
@@ -60,8 +61,41 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <returns>true if a valid agent was found, false otherwise</returns>
         bool SaveBakedTextures(UUID agentId);
 
+        /// <summary>
+        /// Validate that OpenSim can find the baked textures need to display a given avatar
+        /// </summary>
+        /// <param name="client"></param>
+        /// <param name="checkonly"></param>
+        /// <returns>
+        /// true if all the baked textures referenced by the texture IDs exist or the appearance is only using default textures.  false otherwise.
+        /// </returns>
         bool ValidateBakedTextureCache(IScenePresence sp);
+
+        /// <summary>
+        /// Request a rebake of textures for an avatar.
+        /// </summary>
+        /// <remarks>
+        /// This will send the request to the viewer, since it's there that the rebake is done.
+        /// </remarks>
+        /// <param name="sp">Avatar to rebake.</param>
+        /// <param name="missingTexturesOnly">
+        /// If true, only request a rebake for the textures that are missing.
+        /// If false then we request a rebake of all textures for which we already have references.
+        /// </param>
+        /// <returns>
+        /// Number of rebake requests made.  This will depend upon whether we've previously received texture IDs.
+        /// </returns>
+        int RequestRebake(IScenePresence sp, bool missingTexturesOnly);
+
         void QueueAppearanceSend(UUID agentid);
         void QueueAppearanceSave(UUID agentid);
+
+        /// <summary>
+        /// Get a report about the current state of a scene presence's baked appearance textures.
+        /// </summary>
+        /// <param name="sp"></param>
+        /// <param name="reportOutputAction"></param>
+        /// <returns></returns>
+        void WriteBakedTexturesReport(IScenePresence sp, ReportOutputAction reportOutputAction);
     }
 }

OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs

@@ -35,6 +35,23 @@ namespace OpenSim.Region.Framework.Interfaces
     public interface IJ2KDecoder
     {
         void BeginDecode(UUID assetID, byte[] j2kData, DecodedCallback callback);
-        void Decode(UUID assetID, byte[] j2kData);
+
+        /// <summary>
+        /// Provides a synchronous decode so that caller can be assured that this executes before the next line
+        /// </summary>
+        /// <param name="assetID"></param>
+        /// <param name="j2kData"></param>
+        /// <returns>true if decode was successful.  false otherwise.</returns>
+        bool Decode(UUID assetID, byte[] j2kData);
+
+        /// <summary>
+        /// Provides a synchronous decode so that caller can be assured that this executes before the next line
+        /// </summary>
+        /// <param name="assetID"></param>
+        /// <param name="j2kData"></param>
+        /// <param name="layers">layer data</param>
+        /// <param name="components">number of components</param>
+        /// <returns>true if decode was successful.  false otherwise.</returns>
+        bool Decode(UUID assetID, byte[] j2kData, out OpenJPEG.J2KLayerInfo[] layers, out int components);
     }
 }