Merge branch '0.8-post-fixes' into 0.8-extended

Adds regression test for this case.

.gitignore

@@ -54,6 +54,7 @@ bin/Regions/*
 bin/UserAssets
 bin/assetcache
 bin/maptiles
+bin/bakes
 bin/estate_settings.xml
 bin/config-include/CenomeCache.ini
 bin/config-include/FlotsamCache.ini

BUILDING.md

@@ -19,10 +19,14 @@ Prereqs:
 
 From the distribution type:
  * ./runprebuild.sh
- * nant (or xbuild)
+ * nant (or !* xbuild)
  * cd bin 
  * copy OpenSim.ini.example to OpenSim.ini and other appropriate files in bin/config-include
  * run mono OpenSim.exe
+ !* xbuild option switches
+ !*          clean:  xbuild /target:clean
+ !*          debug: (default) xbuild /property:Configuration=Debug
+ !*          release: xbuild /property:Configuration=Release
 
 # Using Monodevelop
 

CONTRIBUTORS.txt

@@ -68,6 +68,7 @@ what it is today.
 * alex_carnell
 * Alan Webb (IBM)
 * Aleric
+* Alicia Raven
 * Allen Kerensky
 * BigFootAg
 * BlueWall Slade

OpenSim/Addons/Groups/GroupsExtendedData.cs

@@ -174,7 +174,7 @@ namespace OpenSim.Groups
             if (dict.ContainsKey("ServiceLocation") && dict["ServiceLocation"] != null)
                 grec.ServiceLocation = dict["ServiceLocation"].ToString();
             else
-                grec.GroupName = string.Empty;
+                grec.ServiceLocation = string.Empty;
 
             if (dict.ContainsKey("ShownInList") && dict["ShownInList"] != null)
                 grec.ShowInList = bool.Parse(dict["ShownInList"].ToString());

OpenSim/Addons/Groups/GroupsMessagingModule.cs

@@ -325,6 +325,13 @@ namespace OpenSim.Groups
                 im.RegionID = thisClient.Scene.RegionInfo.RegionID.Guid;
             }
 
+            if ((im.binaryBucket == null) || (im.binaryBucket.Length == 0) || ((im.binaryBucket.Length == 1 && im.binaryBucket[0] == 0)))
+            {
+                ExtendedGroupRecord groupInfo = m_groupData.GetGroupRecord(UUID.Zero.ToString(), groupID, null);
+                if (groupInfo != null)
+                    im.binaryBucket = Util.StringToBytes256(groupInfo.GroupName);
+            }
+
             // Send to self first of all
             im.toAgentID = im.fromAgentID;
             im.fromGroup = true;

OpenSim/Addons/Groups/GroupsModule.cs

@@ -1296,7 +1296,7 @@ namespace OpenSim.Groups
                         presence.Grouptitle = Title;
 
                         if (! presence.IsChildAgent)
-                            presence.SendAvatarDataToAllAgents();
+                            presence.SendAvatarDataToAllClients();
                     }
                 }
             }

OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs

@@ -209,11 +209,13 @@ namespace OpenSim.Groups
                 string agentID = request["AgentID"].ToString();
                 string token = request["AccessToken"].ToString();
 
-                m_GroupsService.RemoveAgentFromGroup(agentID, agentID, groupID, token);
+                if (!m_GroupsService.RemoveAgentFromGroup(agentID, agentID, groupID, token))
+                    NullResult(result, "Internal error");
+                else
+                    result["RESULT"] = "true";
             }
 
             //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            result["RESULT"] = "true";
             return Util.UTF8NoBomEncoding.GetBytes(ServerUtils.BuildXmlResponse(result));
         }
 

OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs

@@ -109,7 +109,7 @@ namespace OpenSim.Groups
                 string method = request["METHOD"].ToString();
                 request.Remove("METHOD");
 
-                m_log.DebugFormat("[Groups.Handler]: {0}", method);
+//                m_log.DebugFormat("[Groups.Handler]: {0}", method);
                 switch (method)
                 {
                     case "PUTGROUP":
@@ -285,11 +285,13 @@ namespace OpenSim.Groups
                 string agentID = request["AgentID"].ToString();
                 string requestingAgentID = request["RequestingAgentID"].ToString();
 
-                m_GroupsService.RemoveAgentFromGroup(requestingAgentID, agentID, groupID);
+                if (!m_GroupsService.RemoveAgentFromGroup(requestingAgentID, agentID, groupID))
+                    NullResult(result, string.Format("Insufficient permissions.", agentID));
+                else
+                    result["RESULT"] = "true";
             }
 
             //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            result["RESULT"] = "true";
             return Util.UTF8NoBomEncoding.GetBytes(ServerUtils.BuildXmlResponse(result));
         }
 
@@ -665,7 +667,11 @@ namespace OpenSim.Groups
                     GroupInviteInfo invite = m_GroupsService.GetAgentToGroupInvite(request["RequestingAgentID"].ToString(), 
                         new UUID(request["InviteID"].ToString()));
 
+                    if (invite != null)
                         result["RESULT"] = GroupsDataUtils.GroupInviteInfo(invite);
+                    else
+                        result["RESULT"] = "NULL";
+
                     return Util.UTF8NoBomEncoding.GetBytes(ServerUtils.BuildXmlResponse(result));
                 }
 

OpenSim/Addons/Groups/Service/GroupsService.cs

@@ -393,13 +393,15 @@ namespace OpenSim.Groups
             return true;
         }
 
-        public void RemoveAgentFromGroup(string RequestingAgentID, string AgentID, UUID GroupID)
+        public bool RemoveAgentFromGroup(string RequestingAgentID, string AgentID, UUID GroupID)
         {
             // check perms
             if (RequestingAgentID != AgentID && !HasPower(RequestingAgentID, GroupID, GroupPowers.Eject))
-                    return;
+                return false;
 
             _RemoveAgentFromGroup(RequestingAgentID, AgentID, GroupID);
+
+            return true;
         }
 
         public bool AddAgentToGroupInvite(string RequestingAgentID, UUID inviteID, UUID groupID, UUID roleID, string agentID)

OpenSim/Addons/Groups/Service/HGGroupsService.cs

@@ -131,19 +131,27 @@ namespace OpenSim.Groups
             return true;
         }
 
-        public void RemoveAgentFromGroup(string RequestingAgentID, string AgentID, UUID GroupID, string token)
+        public bool RemoveAgentFromGroup(string RequestingAgentID, string AgentID, UUID GroupID, string token)
         {
             // check the token
             MembershipData membership = m_Database.RetrieveMember(GroupID, AgentID);
             if (membership != null)
             {
                 if (token != string.Empty && token.Equals(membership.Data["AccessToken"]))
-                    RemoveAgentFromGroup(RequestingAgentID, AgentID, GroupID);
+                {
-                else
+                    return RemoveAgentFromGroup(RequestingAgentID, AgentID, GroupID);
-                    m_log.DebugFormat("[Groups.HGGroupsService]: access token {0} did not match stored one {1}", token, membership.Data["AccessToken"]);
                 }
                 else
+                {
+                    m_log.DebugFormat("[Groups.HGGroupsService]: access token {0} did not match stored one {1}", token, membership.Data["AccessToken"]);
+                    return false;
+                }
+            }
+            else
+            {
                 m_log.DebugFormat("[Groups.HGGroupsService]: membership not found for {0}", AgentID);
+                return false;
+            }
         }
 
         public ExtendedGroupRecord GetGroupRecord(string RequestingAgentID, UUID GroupID, string groupName, string token)

OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRobustConnector.cs

@@ -215,18 +215,7 @@ namespace OpenSim.OfflineIM
 
             rootElement.AppendChild(result);
 
-            return DocToBytes(doc);
+            return Util.DocToBytes(doc);
-        }
-
-        private byte[] DocToBytes(XmlDocument doc)
-        {
-            MemoryStream ms = new MemoryStream();
-            XmlTextWriter xw = new XmlTextWriter(ms, null);
-            xw.Formatting = Formatting.Indented;
-            doc.WriteTo(xw);
-            xw.Flush();
-
-            return ms.ToArray();
         }
 
         #endregion

OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs

@@ -32,6 +32,7 @@ using log4net;
 using Mono.Addins;
 using Nini.Config;
 using OpenSim;
+using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
@@ -45,6 +46,12 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
+        /// <summary>
+        /// Controls whether we load modules from Mono.Addins.
+        /// </summary>
+        /// <remarks>For debug purposes.  Defaults to true.</remarks>
+        public bool LoadModulesFromAddins { get; set; }
+
         // Config access
         private OpenSimBase m_openSim;
 
@@ -61,6 +68,11 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
         private List<ISharedRegionModule> m_sharedInstances =
                 new List<ISharedRegionModule>();
 
+        public RegionModulesControllerPlugin()
+        {
+            LoadModulesFromAddins = true;
+        }
+
 #region IApplicationPlugin implementation
         
         public void Initialise (OpenSimBase openSim)
@@ -69,6 +81,9 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
             m_openSim.ApplicationRegistry.RegisterInterface<IRegionModulesController>(this);
             m_log.DebugFormat("[REGIONMODULES]: Initializing...");
 
+            if (!LoadModulesFromAddins)
+                return;
+
             // Who we are
             string id = AddinManager.CurrentAddin.Id;
 
@@ -88,40 +103,8 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
             Dictionary<RuntimeAddin, IList<int>> loadedModules = new Dictionary<RuntimeAddin, IList<int>>();
 
             // Scan modules and load all that aren't disabled
-            foreach (TypeExtensionNode node in
+            foreach (TypeExtensionNode node in AddinManager.GetExtensionNodes("/OpenSim/RegionModules"))
-                    AddinManager.GetExtensionNodes("/OpenSim/RegionModules"))
+                AddNode(node, modulesConfig, loadedModules);
-            {
-                IList<int> loadedModuleData;
-
-                if (!loadedModules.ContainsKey(node.Addin))
-                    loadedModules.Add(node.Addin, new List<int> { 0, 0, 0 });
-
-                loadedModuleData = loadedModules[node.Addin];
-                      
-                if (node.Type.GetInterface(typeof(ISharedRegionModule).ToString()) != null)
-                {
-                    if (CheckModuleEnabled(node, modulesConfig))
-                    {
-                        m_log.DebugFormat("[REGIONMODULES]: Found shared region module {0}, class {1}", node.Id, node.Type);
-                        m_sharedModules.Add(node);
-                        loadedModuleData[0]++;
-                    }
-                }
-                else if (node.Type.GetInterface(typeof(INonSharedRegionModule).ToString()) != null)
-                {
-                    if (CheckModuleEnabled(node, modulesConfig))
-                    {
-                        m_log.DebugFormat("[REGIONMODULES]: Found non-shared region module {0}, class {1}", node.Id, node.Type);
-                        m_nonSharedModules.Add(node);
-                        loadedModuleData[1]++;
-                    }
-                }
-                else
-                {
-                    m_log.WarnFormat("[REGIONMODULES]: Found unknown type of module {0}, class {1}", node.Id, node.Type);
-                    loadedModuleData[2]++;
-                }
-            }
 
             foreach (KeyValuePair<RuntimeAddin, IList<int>> loadedModuleData in loadedModules)
             {
@@ -194,6 +177,41 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
 
 #region IPlugin implementation
 
+        private void AddNode(
+            TypeExtensionNode node, IConfig modulesConfig, Dictionary<RuntimeAddin, IList<int>> loadedModules)
+        {
+            IList<int> loadedModuleData;
+
+            if (!loadedModules.ContainsKey(node.Addin))
+                loadedModules.Add(node.Addin, new List<int> { 0, 0, 0 });
+
+            loadedModuleData = loadedModules[node.Addin];
+
+            if (node.Type.GetInterface(typeof(ISharedRegionModule).ToString()) != null)
+            {
+                if (CheckModuleEnabled(node, modulesConfig))
+                {
+                    m_log.DebugFormat("[REGIONMODULES]: Found shared region module {0}, class {1}", node.Id, node.Type);
+                    m_sharedModules.Add(node);
+                    loadedModuleData[0]++;
+                }
+            }
+            else if (node.Type.GetInterface(typeof(INonSharedRegionModule).ToString()) != null)
+            {
+                if (CheckModuleEnabled(node, modulesConfig))
+                {
+                    m_log.DebugFormat("[REGIONMODULES]: Found non-shared region module {0}, class {1}", node.Id, node.Type);
+                    m_nonSharedModules.Add(node);
+                    loadedModuleData[1]++;
+                }
+            }
+            else
+            {
+                m_log.WarnFormat("[REGIONMODULES]: Found unknown type of module {0}, class {1}", node.Id, node.Type);
+                loadedModuleData[2]++;
+            }
+        }
+
         // We don't do that here
         //
         public void Initialise ()
@@ -215,6 +233,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
                 m_sharedInstances[0].Close();
                 m_sharedInstances.RemoveAt(0);
             }
+
             m_sharedModules.Clear();
             m_nonSharedModules.Clear();
         }

OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs

@@ -162,6 +162,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     availableMethods["admin_acl_list"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAccessListList);
                     availableMethods["admin_estate_reload"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcEstateReload);
 
+                    // Land management
+                    availableMethods["admin_reset_land"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcResetLand);
+
                     // Either enable full remote functionality or just selected features
                     string enabledMethods = m_config.GetString("enabled_methods", "all");
 
@@ -2063,6 +2066,56 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             responseData["success"] = true;
         }
 
+        private void XmlRpcResetLand(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)
+        {
+            Hashtable requestData = (Hashtable)request.Params[0];
+            Hashtable responseData = (Hashtable)response.Value;
+
+            string musicURL = string.Empty;
+            UUID groupID = UUID.Zero;
+            uint flags = 0;
+            bool set_group = false, set_music = false, set_flags = false;
+
+            if (requestData.Contains("group") && requestData["group"] != null)
+                set_group = UUID.TryParse(requestData["group"].ToString(), out groupID);
+            if (requestData.Contains("music") && requestData["music"] != null)
+            {
+                musicURL = requestData["music"].ToString();
+                set_music = true;
+            }
+            if (requestData.Contains("flags") && requestData["flags"] != null)
+                set_flags = UInt32.TryParse(requestData["flags"].ToString(), out flags);
+
+            m_log.InfoFormat("[RADMIN]: Received Reset Land Request group={0} musicURL={1} flags={2}", 
+                (set_group ? groupID.ToString() : "unchanged"), 
+                (set_music ? musicURL : "unchanged"), 
+                (set_flags ? flags.ToString() : "unchanged"));
+
+            m_application.SceneManager.ForEachScene(delegate(Scene s)
+            {
+                List<ILandObject> parcels = s.LandChannel.AllParcels();
+                foreach (ILandObject p in parcels)
+                {
+                    if (set_music)
+                        p.LandData.MusicURL = musicURL;
+
+                    if (set_group)
+                        p.LandData.GroupID = groupID;
+
+                    if (set_flags)
+                        p.LandData.Flags = flags;
+
+                    s.LandChannel.UpdateLandObject(p.LandData.LocalID, p.LandData);
+                }
+            }
+            );
+
+            responseData["success"] = true;
+
+            m_log.Info("[RADMIN]: Reset Land Request complete");
+        }
+
+
         /// <summary>
         /// Parse a float with the given parameter name from a request data hash table.
         /// </summary>

OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs

@@ -52,7 +52,7 @@ namespace OpenSim.Capabilities.Handlers.GetTexture.Tests
             // Overkill - we only really need the asset service, not a whole scene.
             Scene scene = new SceneHelpers().SetupScene();
 
-            GetTextureHandler handler = new GetTextureHandler(null, scene.AssetService, "TestGetTexture", null, null);
+            GetTextureHandler handler = new GetTextureHandler("/gettexture", scene.AssetService, "TestGetTexture", null, null);
             TestOSHttpRequest req = new TestOSHttpRequest();
             TestOSHttpResponse resp = new TestOSHttpResponse();
             req.Url = new Uri("http://localhost/?texture_id=00000000-0000-1111-9999-000000000012");

OpenSim/Capabilities/LLSD.cs

@@ -68,7 +68,10 @@ namespace OpenSim.Framework.Capabilities
         /// <returns></returns>
         public static object LLSDDeserialize(byte[] b)
         {
-            return LLSDDeserialize(new MemoryStream(b, false));
+            using (MemoryStream ms = new MemoryStream(b, false))
+            {
+                return LLSDDeserialize(ms);
+            }
         }
 
         /// <summary>
@@ -78,7 +81,8 @@ namespace OpenSim.Framework.Capabilities
         /// <returns></returns>
         public static object LLSDDeserialize(Stream st)
         {
-            XmlTextReader reader = new XmlTextReader(st);
+            using (XmlTextReader reader = new XmlTextReader(st))
+            {
                 reader.Read();
                 SkipWS(reader);
 
@@ -94,6 +98,7 @@ namespace OpenSim.Framework.Capabilities
 
                 return ret;
             }
+        }
 
         /// <summary>
         ///

OpenSim/Data/IEstateDataStore.cs

@@ -29,7 +29,7 @@ using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
 
-namespace OpenSim.Region.Framework.Interfaces
+namespace OpenSim.Data
 {
     public interface IEstateDataStore
     {

OpenSim/Data/IRegionData.cs

@@ -52,12 +52,12 @@ namespace OpenSim.Data
         public int sizeY;
 
         /// <summary>
-        /// Return the x-coordinate of this region.
+        /// Return the x-coordinate of this region in region units.
         /// </summary>
         public int coordX { get { return (int)Util.WorldToRegionLoc((uint)posX); } }
 
         /// <summary>
-        /// Return the y-coordinate of this region.
+        /// Return the y-coordinate of this region in region units.
         /// </summary>
         public int coordY { get { return (int)Util.WorldToRegionLoc((uint)posY); } }
 

OpenSim/Data/MySQL/MySQLAssetData.cs

@@ -45,7 +45,6 @@ namespace OpenSim.Data.MySQL
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private string m_connectionString;
-        private object m_dbLock = new object();
 
         protected virtual Assembly Assembly
         {
@@ -107,8 +106,7 @@ namespace OpenSim.Data.MySQL
         override public AssetBase GetAsset(UUID assetID)
         {
             AssetBase asset = null;
-            lock (m_dbLock)
+
-            {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
@@ -147,7 +145,7 @@ namespace OpenSim.Data.MySQL
                     }
                 }
             }
-            }
+
             return asset;
         }
 
@@ -157,8 +155,6 @@ namespace OpenSim.Data.MySQL
         /// <param name="asset">Asset UUID to create</param>
         /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks>
         override public void StoreAsset(AssetBase asset)
-        {
-            lock (m_dbLock)
         {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
@@ -219,11 +215,8 @@ namespace OpenSim.Data.MySQL
                 }
             }
         }
-        }
 
         private void UpdateAccessTime(AssetBase asset)
-        {
-            lock (m_dbLock)
         {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
@@ -254,7 +247,6 @@ namespace OpenSim.Data.MySQL
                 }
             }
         }
-        }
 
         /// <summary>
         /// Check if the assets exist in the database.
@@ -271,8 +263,6 @@ namespace OpenSim.Data.MySQL
             string ids = "'" + string.Join("','", uuids) + "'";
             string sql = string.Format("SELECT id FROM assets WHERE id IN ({0})", ids);
 
-            lock (m_dbLock)
-            {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
@@ -288,7 +278,6 @@ namespace OpenSim.Data.MySQL
                     }
                 }
             }
-            }
 
             bool[] results = new bool[uuids.Length];
             for (int i = 0; i < uuids.Length; i++)
@@ -309,8 +298,6 @@ namespace OpenSim.Data.MySQL
         {
             List<AssetMetadata> retList = new List<AssetMetadata>(count);
 
-            lock (m_dbLock)
-            {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
@@ -355,14 +342,11 @@ namespace OpenSim.Data.MySQL
                     }
                 }
             }
-            }
 
             return retList;
         }
 
         public override bool Delete(string id)
-        {
-            lock (m_dbLock)
         {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
@@ -374,7 +358,6 @@ namespace OpenSim.Data.MySQL
                     cmd.ExecuteNonQuery();
                 }
             }
-            }
 
             return true;
         }

OpenSim/Data/MySQL/MySQLEstateData.cs

@@ -145,7 +145,11 @@ namespace OpenSim.Data.MySQL
                 cmd.CommandText = sql;
                 cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
 
-                return DoLoad(cmd, regionID, create);
+                EstateSettings e = DoLoad(cmd, regionID, create);
+                if (!create && e.EstateID == 0) // Not found
+                    return null;
+
+                return e;
             }
         }
 
@@ -427,7 +431,10 @@ namespace OpenSim.Data.MySQL
                 cmd.CommandText = sql;
                 cmd.Parameters.AddWithValue("?EstateID", estateID);
 
-                return DoLoad(cmd, UUID.Zero, false);
+                EstateSettings e =  DoLoad(cmd, UUID.Zero, false);
+                if (e.EstateID != estateID)
+                    return null;
+                return e;
             }
         }
         

OpenSim/Data/MySQL/MySQLFramework.cs

@@ -45,21 +45,13 @@ namespace OpenSim.Data.MySQL
                 System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
         protected string m_connectionString;
-        protected object m_dbLock = new object();
 
         protected MySqlFramework(string connectionString)
         {
             m_connectionString = connectionString;
         }
 
-        //////////////////////////////////////////////////////////////
-        //
-        // All non queries are funneled through one connection
-        // to increase performance a little
-        //
         protected int ExecuteNonQuery(MySqlCommand cmd)
-        {
-            lock (m_dbLock)
         {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
@@ -78,5 +70,4 @@ namespace OpenSim.Data.MySQL
             }
         }
     }
-    }
 }

OpenSim/Data/MySQL/MySQLSimulationData.cs

@@ -51,6 +51,15 @@ namespace OpenSim.Data.MySQL
         private static string LogHeader = "[REGION DB MYSQL]";
 
         private string m_connectionString;
+
+        /// <summary>
+        /// This lock was being used to serialize database operations when the connection was shared, but this has
+        /// been unnecessary for a long time after we switched to using MySQL's underlying connection pooling instead.
+        /// FIXME: However, the locks remain in many places since they are effectively providing a level of 
+        /// transactionality.  This should be replaced by more efficient database transactions which would not require
+        /// unrelated operations to block each other or unrelated operations on the same tables from blocking each
+        /// other.
+        /// </summary>
         private object m_dbLock = new object();
 
         protected virtual Assembly Assembly
@@ -738,8 +747,6 @@ namespace OpenSim.Data.MySQL
             RegionLightShareData nWP = new RegionLightShareData();
             nWP.OnSave += StoreRegionWindlightSettings;
 
-            lock (m_dbLock)
-            {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
@@ -829,7 +836,6 @@ namespace OpenSim.Data.MySQL
                     }
                 }
             }
-            }
 
             return nWP;
         }
@@ -875,8 +881,6 @@ namespace OpenSim.Data.MySQL
         }
 
         public void StoreRegionWindlightSettings(RegionLightShareData wl)
-        {
-            lock (m_dbLock)
         {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
@@ -978,11 +982,8 @@ namespace OpenSim.Data.MySQL
                 }
             }
         }
-        }
 
         public void RemoveRegionWindlightSettings(UUID regionID)
-        {
-            lock (m_dbLock)
         {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
@@ -996,12 +997,9 @@ namespace OpenSim.Data.MySQL
                 }
             }
         }
-        }
 
         #region RegionEnvironmentSettings
         public string LoadRegionEnvironmentSettings(UUID regionUUID)
-        {
-            lock (m_dbLock)
         {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
@@ -1027,11 +1025,8 @@ namespace OpenSim.Data.MySQL
                 }
             }
         }
-        }
 
         public void StoreRegionEnvironmentSettings(UUID regionUUID, string settings)
-        {
-            lock (m_dbLock)
         {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
@@ -1048,11 +1043,8 @@ namespace OpenSim.Data.MySQL
                 }
             }
         }
-        }
 
         public void RemoveRegionEnvironmentSettings(UUID regionUUID)
-        {
-            lock (m_dbLock)
         {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
@@ -1066,12 +1058,9 @@ namespace OpenSim.Data.MySQL
                 }
             }
         }
-        }
         #endregion
 
         public void StoreRegionSettings(RegionSettings rs)
-        {
-            lock (m_dbLock)
         {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
@@ -1121,7 +1110,7 @@ namespace OpenSim.Data.MySQL
                     ExecuteNonQuery(cmd);
                 }
             }
-            }
+
             SaveSpawnPoints(rs);
         }
 
@@ -2042,8 +2031,6 @@ namespace OpenSim.Data.MySQL
         }
 
         public void SaveExtra(UUID regionID, string name, string val)
-        {
-            lock (m_dbLock)
         {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
@@ -2060,11 +2047,8 @@ namespace OpenSim.Data.MySQL
                 }
             }
         }
-        }
 
         public void RemoveExtra(UUID regionID, string name)
-        {
-            lock (m_dbLock)
         {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
@@ -2080,14 +2064,11 @@ namespace OpenSim.Data.MySQL
                 }
             }
         }
-        }
 
         public Dictionary<string, string> GetExtra(UUID regionID)
         {
             Dictionary<string, string> ret = new Dictionary<string, string>();
 
-            lock (m_dbLock)
-            {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
@@ -2105,7 +2086,6 @@ namespace OpenSim.Data.MySQL
                     }
                 }
             }
-            }
 
             return ret;
         }

OpenSim/Data/MySQL/MySQLUserProfilesData.cs

@@ -47,11 +47,6 @@ namespace OpenSim.Data.MySQL
             get; set;
         }
         
-        protected object Lock
-        {
-            get; set;
-        }
-        
         protected virtual Assembly Assembly
         {
             get { return GetType().Assembly; }
@@ -250,7 +245,7 @@ namespace OpenSim.Data.MySQL
             string query = string.Empty;
             
             query += "DELETE FROM classifieds WHERE ";
-            query += "classifieduuid = ?ClasifiedId";
+            query += "classifieduuid = ?recordId";
             
             try
             {
@@ -260,15 +255,11 @@ namespace OpenSim.Data.MySQL
                     
                     using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("?ClassifiedId", recordId.ToString());
+                        cmd.Parameters.AddWithValue("?recordId", recordId.ToString());
-                        
-                        lock(Lock)
-                        {
                         cmd.ExecuteNonQuery();
                     }
                 }
             }
-            }
             catch (Exception e)
             {
                 m_log.DebugFormat("[PROFILES_DATA]" +
@@ -1030,8 +1021,6 @@ namespace OpenSim.Data.MySQL
                                     put.Parameters.AddWithValue("?DataKey", props.DataKey.ToString());
                                     put.Parameters.AddWithValue("?DataVal", props.DataVal.ToString());
 
-                                    lock(Lock)
-                                    {
                                     put.ExecuteNonQuery();
                                 }
                             }
@@ -1039,7 +1028,6 @@ namespace OpenSim.Data.MySQL
                     }
                 }
             }
-            }
             catch (Exception e)
             {
                 m_log.DebugFormat("[PROFILES_DATA]" +
@@ -1069,17 +1057,14 @@ namespace OpenSim.Data.MySQL
                     using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                     {
                         cmd.Parameters.AddWithValue("?UserId", props.UserId.ToString());
-                        cmd.Parameters.AddWithValue("?TagId", props.TagId.ToString ());
+                        cmd.Parameters.AddWithValue("?TagId", props.TagId.ToString());
-                        cmd.Parameters.AddWithValue("?DataKey", props.DataKey.ToString ());
+                        cmd.Parameters.AddWithValue("?DataKey", props.DataKey.ToString());
-                        cmd.Parameters.AddWithValue("?DataVal", props.DataKey.ToString ());
+                        cmd.Parameters.AddWithValue("?DataVal", props.DataKey.ToString());
 
-                        lock(Lock)
-                        {
                         cmd.ExecuteNonQuery();
                     }
                 }
             }
-            }
             catch (Exception e)
             {
                 m_log.DebugFormat("[PROFILES_DATA]" +
@@ -1091,4 +1076,3 @@ namespace OpenSim.Data.MySQL
         #endregion Integration
     }
 }
-

OpenSim/Data/MySQL/MySQLXAssetData.cs

@@ -57,7 +57,6 @@ namespace OpenSim.Data.MySQL
 
         private bool m_enableCompression = false;
         private string m_connectionString;
-        private object m_dbLock = new object();
 
         /// <summary>
         /// We can reuse this for all hashing since all methods are single-threaded through m_dbBLock
@@ -131,8 +130,7 @@ namespace OpenSim.Data.MySQL
 //            m_log.DebugFormat("[MYSQL XASSET DATA]: Looking for asset {0}", assetID);
 
             AssetBase asset = null;
-            lock (m_dbLock)
+
-            {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
@@ -168,12 +166,12 @@ namespace OpenSim.Data.MySQL
                                     {
                                         MemoryStream outputStream = new MemoryStream();
                                         WebUtil.CopyStream(decompressionStream, outputStream, int.MaxValue);
-    //                                        int compressedLength = asset.Data.Length;
+//                                        int compressedLength = asset.Data.Length;
                                         asset.Data = outputStream.ToArray();
 
-    //                                        m_log.DebugFormat(
+//                                        m_log.DebugFormat(
-    //                                            "[XASSET DB]: Decompressed {0} {1} to {2} bytes from {3}",
+//                                            "[XASSET DB]: Decompressed {0} {1} to {2} bytes from {3}",
-    //                                            asset.ID, asset.Name, asset.Data.Length, compressedLength);
+//                                            asset.ID, asset.Name, asset.Data.Length, compressedLength);
                                     }
                                 }
 
@@ -187,7 +185,6 @@ namespace OpenSim.Data.MySQL
                     }
                 }
             }
-            }
 
             return asset;
         }
@@ -201,8 +198,6 @@ namespace OpenSim.Data.MySQL
         {
 //            m_log.DebugFormat("[XASSETS DB]: Storing asset {0} {1}", asset.Name, asset.ID);
 
-            lock (m_dbLock)
-            {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
@@ -233,7 +228,7 @@ namespace OpenSim.Data.MySQL
 
                         using (GZipStream compressionStream = new GZipStream(outputStream, CompressionMode.Compress, false))
                         {
-    //                            Console.WriteLine(WebUtil.CopyTo(new MemoryStream(asset.Data), compressionStream, int.MaxValue));
+//                            Console.WriteLine(WebUtil.CopyTo(new MemoryStream(asset.Data), compressionStream, int.MaxValue));
                             // We have to close the compression stream in order to make sure it writes everything out to the underlying memory output stream.
                             compressionStream.Close();
                             byte[] compressedData = outputStream.ToArray();
@@ -310,7 +305,6 @@ namespace OpenSim.Data.MySQL
                 }
             }
         }
-        }
 
         /// <summary>
         /// Updates the access time of the asset if it was accessed above a given threshhold amount of time.
@@ -328,8 +322,6 @@ namespace OpenSim.Data.MySQL
             if ((now - Utils.UnixTimeToDateTime(accessTime)).TotalDays < DaysBetweenAccessTimeUpdates)
                 return;
 
-            lock (m_dbLock)
-            {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
@@ -354,7 +346,6 @@ namespace OpenSim.Data.MySQL
                 }
             }
         }
-        }
 
         /// <summary>
         /// We assume we already have the m_dbLock.
@@ -411,8 +402,6 @@ namespace OpenSim.Data.MySQL
             string ids = "'" + string.Join("','", uuids) + "'";
             string sql = string.Format("SELECT ID FROM assets WHERE ID IN ({0})", ids);
 
-            lock (m_dbLock)
-            {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
@@ -428,7 +417,6 @@ namespace OpenSim.Data.MySQL
                     }
                 }
             }
-            }
 
             bool[] results = new bool[uuids.Length];
             for (int i = 0; i < uuids.Length; i++)
@@ -449,8 +437,6 @@ namespace OpenSim.Data.MySQL
         {
             List<AssetMetadata> retList = new List<AssetMetadata>(count);
 
-            lock (m_dbLock)
-            {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
@@ -487,7 +473,6 @@ namespace OpenSim.Data.MySQL
                     m_log.Error("[XASSETS DB]: MySql failure fetching asset set" + Environment.NewLine + e.ToString());
                 }
             }
-            }
 
             return retList;
         }
@@ -496,8 +481,6 @@ namespace OpenSim.Data.MySQL
         {
 //            m_log.DebugFormat("[XASSETS DB]: Deleting asset {0}", id);
 
-            lock (m_dbLock)
-            {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
@@ -511,7 +494,6 @@ namespace OpenSim.Data.MySQL
                 // TODO: How do we deal with data from deleted assets?  Probably not easily reapable unless we
                 // keep a reference count (?)
             }
-            }
 
             return true;
         }

OpenSim/Data/SQLite/SQLiteInventoryStore.cs

@@ -239,7 +239,7 @@ namespace OpenSim.Data.SQLite
                 if (inventoryRow == null)
                 {
                     if (! add)
-                        m_log.ErrorFormat("Interface Misuse: Attempting to Update non-existant inventory folder: {0}", folder.ID);
+                        m_log.ErrorFormat("Interface Misuse: Attempting to Update non-existent inventory folder: {0}", folder.ID);
 
                     inventoryRow = inventoryFolderTable.NewRow();
                     fillFolderRow(inventoryRow, folder);
@@ -298,7 +298,7 @@ namespace OpenSim.Data.SQLite
                 if (inventoryRow == null)
                 {
                     if (!add)
-                        m_log.ErrorFormat("[INVENTORY DB]: Interface Misuse: Attempting to Update non-existant inventory item: {0}", item.ID);
+                        m_log.ErrorFormat("[INVENTORY DB]: Interface Misuse: Attempting to Update non-existent inventory item: {0}", item.ID);
 
                     inventoryRow = inventoryItemTable.NewRow();
                     fillItemRow(inventoryRow, item);

OpenSim/Framework/AvatarAppearance.cs

@@ -520,6 +520,12 @@ namespace OpenSim.Framework
                 if (!m_attachments.ContainsKey(attach.AttachPoint))
                     m_attachments[attach.AttachPoint] = new List<AvatarAttachment>();
     
+                foreach (AvatarAttachment prev in m_attachments[attach.AttachPoint])
+                {
+                    if (prev.ItemID == attach.ItemID)
+                        return;
+                }
+
                 m_attachments[attach.AttachPoint].Add(attach);
             }
         }

OpenSim/Framework/ClientInfo.cs

@@ -54,6 +54,7 @@ namespace OpenSim.Framework
         public int assetThrottle;
         public int textureThrottle;
         public int totalThrottle;
+        public int maxThrottle;
 
         public Dictionary<string, int> SyncRequests = new Dictionary<string,int>();
         public Dictionary<string, int> AsyncRequests = new Dictionary<string,int>();

OpenSim/Framework/Communications/RestClient.cs

@@ -56,7 +56,7 @@ namespace OpenSim.Framework.Communications
     /// other threads to execute, while it waits for a response from the web-service. RestClient itself can be
     /// invoked by the caller in either synchronous mode or asynchronous modes.
     /// </remarks>
-    public class RestClient
+    public class RestClient : IDisposable
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -148,6 +148,33 @@ namespace OpenSim.Framework.Communications
 
         #endregion constructors
 
+
+        #region Dispose
+
+        private bool disposed = false;
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this); 
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposed)
+                return;
+
+            if (disposing)
+            {
+                _resource.Dispose();
+            }
+
+            disposed = true;
+        }
+
+        #endregion Dispose
+
+
         /// <summary>
         /// Add a path element to the query, e.g. assets
         /// </summary>
@@ -296,6 +323,14 @@ namespace OpenSim.Framework.Communications
 
         #endregion Async communications with server
 
+        /// <summary>
+        /// Perform a synchronous request
+        /// </summary>
+        public Stream Request()
+        {
+            return Request(null);
+        }
+
         /// <summary>
         /// Perform a synchronous request
         /// </summary>
@@ -312,6 +347,10 @@ namespace OpenSim.Framework.Communications
                 if (auth != null)
                     auth.AddAuthorization(_request.Headers);
 
+                int reqnum = WebUtil.RequestNumber++;
+                if (WebUtil.DebugLevel >= 3)
+                    m_log.DebugFormat("[LOGHTTP]: HTTP OUT {0} REST {1} to {2}", reqnum, _request.Method, _request.RequestUri);
+
 //                IAsyncResult responseAsyncResult = _request.BeginGetResponse(new AsyncCallback(ResponseIsReadyDelegate), _request);
                 try
                 {
@@ -358,6 +397,9 @@ namespace OpenSim.Framework.Communications
                     _resource.Seek(0, SeekOrigin.Begin);
                 }
 
+                if (WebUtil.DebugLevel >= 5)
+                    WebUtil.LogResponseDetail(reqnum, _resource);
+
                 return _resource;
             }
         }
@@ -374,16 +416,18 @@ namespace OpenSim.Framework.Communications
             if (auth != null)
                 auth.AddAuthorization(_request.Headers);
 
-            m_log.InfoFormat("[REST]: Request Length {0}", _request.ContentLength);
-            m_log.InfoFormat("[REST]: Sending Web Request {0}", buildUri());
             src.Seek(0, SeekOrigin.Begin);
-            m_log.Info("[REST]: Seek is ok");
+
+            int reqnum = WebUtil.RequestNumber++;
+            if (WebUtil.DebugLevel >= 3)
+                m_log.DebugFormat("[LOGHTTP]: HTTP OUT {0} REST {1} to {2}", reqnum, _request.Method, _request.RequestUri);
+            if (WebUtil.DebugLevel >= 5)
+                WebUtil.LogOutgoingDetail(string.Format("SEND {0}: ", reqnum), src);
+
             Stream dst = _request.GetRequestStream();
-            m_log.Info("[REST]: GetRequestStream is ok");
 
             byte[] buf = new byte[1024];
             int length = src.Read(buf, 0, 1024);
-            m_log.Info("[REST]: First Read is ok");
             while (length > 0)
             {
                 dst.Write(buf, 0, length);
@@ -398,14 +442,29 @@ namespace OpenSim.Framework.Communications
             {
                 m_log.WarnFormat("[REST]: Request {0} {1} failed with status {2} and message {3}",
                                   RequestMethod, _request.RequestUri, e.Status, e.Message);
+                return null;
             }
             catch (Exception e)
             {
                 m_log.WarnFormat(
                     "[REST]: Request {0} {1} failed with exception {2} {3}",
                     RequestMethod, _request.RequestUri, e.Message, e.StackTrace);
+                return null;
             }
 
+            if (WebUtil.DebugLevel >= 5)
+            {
+                using (Stream responseStream = _response.GetResponseStream())
+                {
+                    using (StreamReader reader = new StreamReader(responseStream))
+                    {
+                        string responseStr = reader.ReadToEnd();
+                        WebUtil.LogResponseDetail(reqnum, responseStr);
+                    }
+                }
+            }
+
+            _response.Close();
 
 //            IAsyncResult responseAsyncResult = _request.BeginGetResponse(new AsyncCallback(ResponseIsReadyDelegate), _request);
 

OpenSim/Framework/Console/ConsoleUtil.cs

@@ -156,7 +156,7 @@ namespace OpenSim.Framework.Console
         }
 
         /// <summary>
-        /// Convert a console integer to an int, automatically complaining if a console is given.
+        /// Convert a console input to a bool, automatically complaining if a console is given.
         /// </summary>
         /// <param name='console'>Can be null if no console is available.</param>
         /// <param name='rawConsoleVector'>/param>
@@ -176,7 +176,7 @@ namespace OpenSim.Framework.Console
         }
 
         /// <summary>
-        /// Convert a console integer to an int, automatically complaining if a console is given.
+        /// Convert a console input to an int, automatically complaining if a console is given.
         /// </summary>
         /// <param name='console'>Can be null if no console is available.</param>
         /// <param name='rawConsoleInt'>/param>
@@ -195,6 +195,46 @@ namespace OpenSim.Framework.Console
             return true;
         }
 
+        /// <summary>
+        /// Convert a console input to a float, automatically complaining if a console is given.
+        /// </summary>
+        /// <param name='console'>Can be null if no console is available.</param>
+        /// <param name='rawConsoleInput'>/param>
+        /// <param name='i'></param>
+        /// <returns></returns>
+        public static bool TryParseConsoleFloat(ICommandConsole console, string rawConsoleInput, out float i)
+        {
+            if (!float.TryParse(rawConsoleInput, out i))
+            {
+                if (console != null)
+                    console.OutputFormat("ERROR: {0} is not a valid float", rawConsoleInput);
+
+                return false;
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Convert a console input to a double, automatically complaining if a console is given.
+        /// </summary>
+        /// <param name='console'>Can be null if no console is available.</param>
+        /// <param name='rawConsoleInput'>/param>
+        /// <param name='i'></param>
+        /// <returns></returns>
+        public static bool TryParseConsoleDouble(ICommandConsole console, string rawConsoleInput, out double i)
+        {
+            if (!double.TryParse(rawConsoleInput, out i))
+            {
+                if (console != null)
+                    console.OutputFormat("ERROR: {0} is not a valid double", rawConsoleInput);
+
+                return false;
+            }
+
+            return true;
+        }
+
         /// <summary>
         /// Convert a console integer to a natural int, automatically complaining if a console is given.
         /// </summary>

OpenSim/Framework/EstateSettings.cs

@@ -28,6 +28,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Reflection;
 using OpenMetaverse;
 
 namespace OpenSim.Framework
@@ -411,5 +412,23 @@ namespace OpenSim.Framework
         {
             return l_EstateGroups.Contains(groupID);
         }
+
+        public Dictionary<string, object> ToMap()
+        {
+            Dictionary<string, object> map = new Dictionary<string, object>();
+            PropertyInfo[] properties = this.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance);
+            foreach (PropertyInfo p in properties)
+                map[p.Name] = p.GetValue(this, null);
+
+            return map;
+        }
+
+        public EstateSettings(Dictionary<string, object> map)
+        {
+            PropertyInfo[] properties = this.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance);
+            foreach (PropertyInfo p in properties)
+                p.SetValue(this, map[p.Name], null);
+
+        }
     }
 }

OpenSim/Framework/ISceneAgent.cs

@@ -65,13 +65,18 @@ namespace OpenSim.Framework
         /// </remarks>
         AvatarAppearance Appearance { get; set; }
 
+        /// <summary>
+        /// Set if initial data about the scene (avatars, objects) has been sent to the client.
+        /// </summary>
+        bool SentInitialDataToClient { get; }
+
         /// <summary>
         /// Send initial scene data to the client controlling this agent
         /// </summary>
         /// <remarks>
         /// This includes scene object data and the appearance data of other avatars.
         /// </remarks>
-        void SendInitialDataToMe();
+        void SendInitialDataToClient();
 
         /// <summary>
         /// Direction in which the scene presence is looking.

OpenSim/Framework/Monitoring/ServerStatsCollector.cs

@@ -141,19 +141,19 @@ namespace OpenSim.Framework.Monitoring
                 processorPercentPerfCounter = new PerfCounterControl(tempPC);
                 // A long time bug in mono is that CPU percent is reported as CPU percent idle. Windows reports CPU percent busy.
                 tempStat = new Stat(tempName, tempName, "", "percent", CategoryServer, ContainerProcessor,
-                                StatType.Pull, (s) => { GetNextValue(s, processorPercentPerfCounter, Util.IsWindows() ? 1 : -1); },
+                                StatType.Pull, (s) => { GetNextValue(s, processorPercentPerfCounter); },
                                 StatVerbosity.Info);
                 StatsManager.RegisterStat(tempStat);
                 RegisteredStats.Add(tempName, tempStat);
 
                 MakeStat("TotalProcessorTime", null, "sec", ContainerProcessor,
-                                    (s) => { s.Value = Process.GetCurrentProcess().TotalProcessorTime.TotalSeconds; });
+                                    (s) => { s.Value = Math.Round(Process.GetCurrentProcess().TotalProcessorTime.TotalSeconds, 3); });
 
                 MakeStat("UserProcessorTime", null, "sec", ContainerProcessor,
-                                    (s) => { s.Value = Process.GetCurrentProcess().UserProcessorTime.TotalSeconds; });
+                                    (s) => { s.Value = Math.Round(Process.GetCurrentProcess().UserProcessorTime.TotalSeconds, 3); });
 
                 MakeStat("PrivilegedProcessorTime", null, "sec", ContainerProcessor,
-                                    (s) => { s.Value = Process.GetCurrentProcess().PrivilegedProcessorTime.TotalSeconds; });
+                                    (s) => { s.Value = Math.Round(Process.GetCurrentProcess().PrivilegedProcessorTime.TotalSeconds, 3); });
 
                 MakeStat("Threads", null, "threads", ContainerProcessor,
                                     (s) => { s.Value = Process.GetCurrentProcess().Threads.Count; });
@@ -253,11 +253,8 @@ namespace OpenSim.Framework.Monitoring
         //  "How to get the CPU Usage in C#": http://stackoverflow.com/questions/278071/how-to-get-the-cpu-usage-in-c
         //  "Mono Performance Counters": http://www.mono-project.com/Mono_Performance_Counters
         private delegate double PerfCounterNextValue();
+
         private void GetNextValue(Stat stat, PerfCounterControl perfControl)
-        {
-            GetNextValue(stat, perfControl, 1.0);
-        }
-        private void GetNextValue(Stat stat, PerfCounterControl perfControl, double factor)
         {
             if (Util.EnvironmentTickCountSubtract(perfControl.lastFetch) > performanceCounterSampleInterval)
             {
@@ -265,16 +262,13 @@ namespace OpenSim.Framework.Monitoring
                 {
                     try
                     {
-                        // Kludge for factor to run double duty. If -1, subtract the value from one
+                        stat.Value = Math.Round(perfControl.perfCounter.NextValue(), 3);
-                        if (factor == -1)
-                            stat.Value = 1 - perfControl.perfCounter.NextValue();
-                        else
-                            stat.Value = perfControl.perfCounter.NextValue() / factor;
                     }
                     catch (Exception e)
                     {
                         m_log.ErrorFormat("{0} Exception on NextValue fetching {1}: {2}", LogHeader, stat.Name, e);
                     }
+
                     perfControl.lastFetch = Util.EnvironmentTickCount();
                 }
             }

OpenSim/Framework/Monitoring/StatsLogger.cs

@@ -70,18 +70,18 @@ namespace OpenSim.Framework.Monitoring
         {
             ICommandConsole con = MainConsole.Instance;
 
-            if (cmd.Length != 4)
+            if (cmd.Length != 3)
             {
-                con.Output("Usage: debug stats record start|stop");
+                con.Output("Usage: stats record start|stop");
                 return;
             }
 
-            if (cmd[3] == "start")
+            if (cmd[2] == "start")
             {
                 Start();
                 con.OutputFormat("Now recording all stats to file every {0}ms", m_statsLogIntervalMs);
             }
-            else if (cmd[3] == "stop")
+            else if (cmd[2] == "stop")
             {
                 Stop();
                 con.Output("Stopped recording stats to file.");

OpenSim/Framework/RegionInfo.cs

@@ -101,7 +101,6 @@ namespace OpenSim.Framework
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static readonly string LogHeader = "[REGION INFO]";
 
-        public bool commFailTF = false;
         public string RegionFile = String.Empty;
         public bool isSandbox = false;
         public bool Persistent = true;
@@ -147,8 +146,29 @@ namespace OpenSim.Framework
         public uint WorldLocX = 0;
         public uint WorldLocY = 0;
         public uint WorldLocZ = 0;
+
+        /// <summary>
+        /// X dimension of the region.
+        /// </summary>
+        /// <remarks>
+        /// If this is a varregion then the default size set here will be replaced when we load the region config.
+        /// </remarks>
         public uint RegionSizeX = Constants.RegionSize;
+
+        /// <summary>
+        /// X dimension of the region.
+        /// </summary>
+        /// <remarks>
+        /// If this is a varregion then the default size set here will be replaced when we load the region config.
+        /// </remarks>
         public uint RegionSizeY = Constants.RegionSize;
+
+        /// <summary>
+        /// Z dimension of the region.
+        /// </summary>
+        /// <remarks>
+        /// XXX: Unknown if this accounts for regions with negative Z.
+        /// </remarks>
         public uint RegionSizeZ = Constants.RegionHeight;
 
         private Dictionary<String, String> m_extraSettings = new Dictionary<string, string>();
@@ -860,11 +880,6 @@ namespace OpenSim.Framework
                 config.Set("MaptileStaticFile", MaptileStaticFile);
         }
 
-        public bool ignoreIncomingConfiguration(string configuration_key, object configuration_result)
-        {
-            return true;
-        }
-
         public void SaveRegionToFile(string description, string filename)
         {
             if (filename.ToLower().EndsWith(".ini"))

OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs

@@ -51,7 +51,7 @@ namespace OpenSim.Framework.Serialization.External
         /// <param name="xtr"></param>
         /// <returns>true on successful, false if there were any processing failures</returns>
         public static bool ExecuteReadProcessors<NodeType>(
-            NodeType nodeToFill, Dictionary<string, Action<NodeType, XmlTextReader>> processors, XmlTextReader xtr)
+            NodeType nodeToFill, Dictionary<string, Action<NodeType, XmlReader>> processors, XmlReader xtr)
         {
             return ExecuteReadProcessors(
                 nodeToFill,
@@ -75,8 +75,8 @@ namespace OpenSim.Framework.Serialization.External
         /// <returns>true on successful, false if there were any processing failures</returns>
         public static bool ExecuteReadProcessors<NodeType>(
             NodeType nodeToFill,
-            Dictionary<string, Action<NodeType, XmlTextReader>> processors,
+            Dictionary<string, Action<NodeType, XmlReader>> processors,
-            XmlTextReader xtr,
+            XmlReader xtr,
             Action<NodeType, string, Exception> parseExceptionAction)
         {
             bool errors = false;
@@ -88,7 +88,7 @@ namespace OpenSim.Framework.Serialization.External
 
 //                        m_log.DebugFormat("[ExternalRepresentationUtils]: Processing: {0}", nodeName);
 
-                Action<NodeType, XmlTextReader> p = null;
+                Action<NodeType, XmlReader> p = null;
                 if (processors.TryGetValue(xtr.Name, out p))
                 {
 //                            m_log.DebugFormat("[ExternalRepresentationUtils]: Found {0} processor, nodeName);

OpenSim/Framework/Serialization/External/LandDataSerializer.cs

@@ -44,11 +44,11 @@ namespace OpenSim.Framework.Serialization.External
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private static Dictionary<string, Action<LandData, XmlTextReader>> m_ldProcessors
+        private static Dictionary<string, Action<LandData, XmlReader>> m_ldProcessors
-            = new Dictionary<string, Action<LandData, XmlTextReader>>();
+            = new Dictionary<string, Action<LandData, XmlReader>>();
 
-        private static Dictionary<string, Action<LandAccessEntry, XmlTextReader>> m_laeProcessors
+        private static Dictionary<string, Action<LandAccessEntry, XmlReader>> m_laeProcessors
-            = new Dictionary<string, Action<LandAccessEntry, XmlTextReader>>();
+            = new Dictionary<string, Action<LandAccessEntry, XmlReader>>();
 
         static LandDataSerializer()
         {
@@ -134,7 +134,7 @@ namespace OpenSim.Framework.Serialization.External
                 "AccessList",       (lae, xtr) => lae.Flags = (AccessList)Convert.ToUInt32(xtr.ReadElementString("AccessList")));
         }
 
-        public static void ProcessParcelAccessList(LandData ld, XmlTextReader xtr)
+        public static void ProcessParcelAccessList(LandData ld, XmlReader xtr)
         {
             if (!xtr.IsEmptyElement)
             {

OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs

@@ -46,8 +46,8 @@ namespace OpenSim.Framework.Serialization.External
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private static Dictionary<string, Action<InventoryItemBase, XmlTextReader>> m_InventoryItemXmlProcessors
+        private static Dictionary<string, Action<InventoryItemBase, XmlReader>> m_InventoryItemXmlProcessors
-            = new Dictionary<string, Action<InventoryItemBase, XmlTextReader>>();
+            = new Dictionary<string, Action<InventoryItemBase, XmlReader>>();
 
         #region InventoryItemBase Processor initialization 
         static UserInventoryItemSerializer()
@@ -76,103 +76,103 @@ namespace OpenSim.Framework.Serialization.External
         #endregion 
 
         #region InventoryItemBase Processors
-        private static void ProcessName(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessName(InventoryItemBase item, XmlReader reader)
         {
             item.Name = reader.ReadElementContentAsString("Name", String.Empty);
         }
 
-        private static void ProcessID(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessID(InventoryItemBase item, XmlReader reader)
         {
             item.ID = Util.ReadUUID(reader, "ID");
         }
 
-        private static void ProcessInvType(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessInvType(InventoryItemBase item, XmlReader reader)
         {
             item.InvType = reader.ReadElementContentAsInt("InvType", String.Empty);
         }
 
-        private static void ProcessCreatorUUID(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessCreatorUUID(InventoryItemBase item, XmlReader reader)
         {
             item.CreatorId = reader.ReadElementContentAsString("CreatorUUID", String.Empty);
         }
 
-        private static void ProcessCreatorID(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessCreatorID(InventoryItemBase item, XmlReader reader)
         {
             // when it exists, this overrides the previous
             item.CreatorId = reader.ReadElementContentAsString("CreatorID", String.Empty);
         }
 
-        private static void ProcessCreationDate(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessCreationDate(InventoryItemBase item, XmlReader reader)
         {
             item.CreationDate = reader.ReadElementContentAsInt("CreationDate", String.Empty);
         }
 
-        private static void ProcessOwner(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessOwner(InventoryItemBase item, XmlReader reader)
         {
             item.Owner = Util.ReadUUID(reader, "Owner");
         }
 
-        private static void ProcessDescription(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessDescription(InventoryItemBase item, XmlReader reader)
         {
             item.Description = reader.ReadElementContentAsString("Description", String.Empty);
         }
 
-        private static void ProcessAssetType(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessAssetType(InventoryItemBase item, XmlReader reader)
         {
             item.AssetType = reader.ReadElementContentAsInt("AssetType", String.Empty);
         }
 
-        private static void ProcessAssetID(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessAssetID(InventoryItemBase item, XmlReader reader)
         {
             item.AssetID = Util.ReadUUID(reader, "AssetID");
         }
 
-        private static void ProcessSaleType(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessSaleType(InventoryItemBase item, XmlReader reader)
         {
             item.SaleType = (byte)reader.ReadElementContentAsInt("SaleType", String.Empty);
         }
 
-        private static void ProcessSalePrice(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessSalePrice(InventoryItemBase item, XmlReader reader)
         {
             item.SalePrice = reader.ReadElementContentAsInt("SalePrice", String.Empty);
         }
 
-        private static void ProcessBasePermissions(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessBasePermissions(InventoryItemBase item, XmlReader reader)
         {
             item.BasePermissions = (uint)reader.ReadElementContentAsInt("BasePermissions", String.Empty);
         }
 
-        private static void ProcessCurrentPermissions(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessCurrentPermissions(InventoryItemBase item, XmlReader reader)
         {
             item.CurrentPermissions = (uint)reader.ReadElementContentAsInt("CurrentPermissions", String.Empty);
         }
 
-        private static void ProcessEveryOnePermissions(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessEveryOnePermissions(InventoryItemBase item, XmlReader reader)
         {
             item.EveryOnePermissions = (uint)reader.ReadElementContentAsInt("EveryOnePermissions", String.Empty);
         }
 
-        private static void ProcessNextPermissions(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessNextPermissions(InventoryItemBase item, XmlReader reader)
         {
             item.NextPermissions = (uint)reader.ReadElementContentAsInt("NextPermissions", String.Empty);
         }
 
-        private static void ProcessFlags(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessFlags(InventoryItemBase item, XmlReader reader)
         {
             item.Flags = (uint)reader.ReadElementContentAsInt("Flags", String.Empty);
         }
 
-        private static void ProcessGroupID(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessGroupID(InventoryItemBase item, XmlReader reader)
         {
             item.GroupID = Util.ReadUUID(reader, "GroupID");
         }
 
-        private static void ProcessGroupOwned(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessGroupOwned(InventoryItemBase item, XmlReader reader)
         {
             item.GroupOwned = Util.ReadBoolean(reader);
         }
 
-        private static void ProcessCreatorData(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessCreatorData(InventoryItemBase item, XmlReader reader)
         {
             item.CreatorData = reader.ReadElementContentAsString("CreatorData", String.Empty);
         }

OpenSim/Framework/Servers/BaseOpenSimServer.cs

@@ -45,6 +45,7 @@ using OpenSim.Framework.Monitoring;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 using Timer=System.Timers.Timer;
+using Nini.Config;
 
 namespace OpenSim.Framework.Servers
 {
@@ -55,10 +56,16 @@ namespace OpenSim.Framework.Servers
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        /// <summary>
+        /// Used by tests to suppress Environment.Exit(0) so that post-run operations are possible.
+        /// </summary>
+        public bool SuppressExit { get; set; }
+
         /// <summary>
         /// This will control a periodic log printout of the current 'show stats' (if they are active) for this
         /// server.
         /// </summary>
+        private int m_periodDiagnosticTimerMS = 60 * 60 * 1000;
         private Timer m_periodicDiagnosticsTimer = new Timer(60 * 60 * 1000);
         
         /// <summary>
@@ -77,8 +84,6 @@ namespace OpenSim.Framework.Servers
             // Random uuid for private data
             m_osSecret = UUID.Random().ToString();
 
-            m_periodicDiagnosticsTimer.Elapsed += new ElapsedEventHandler(LogDiagnostics);
-            m_periodicDiagnosticsTimer.Enabled = true;
         }
         
         /// <summary>
@@ -89,6 +94,16 @@ namespace OpenSim.Framework.Servers
             StatsManager.SimExtraStats = new SimExtraStatsCollector();
             RegisterCommonCommands();
             RegisterCommonComponents(Config);
+
+            IConfig startupConfig = Config.Configs["Startup"];
+            int logShowStatsSeconds = startupConfig.GetInt("LogShowStatsSeconds", m_periodDiagnosticTimerMS / 1000);
+            m_periodDiagnosticTimerMS = logShowStatsSeconds * 1000;
+            m_periodicDiagnosticsTimer.Elapsed += new ElapsedEventHandler(LogDiagnostics);
+            if (m_periodDiagnosticTimerMS != 0)
+            {
+                m_periodicDiagnosticsTimer.Interval = m_periodDiagnosticTimerMS;
+                m_periodicDiagnosticsTimer.Enabled = true;
+            }
         }       
 
         protected override void ShutdownSpecific()
@@ -99,6 +114,7 @@ namespace OpenSim.Framework.Servers
 
             base.ShutdownSpecific();
 
+            if (!SuppressExit)
                 Environment.Exit(0);
         }
         

OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs

@@ -832,9 +832,14 @@ namespace OpenSim.Framework.Servers.HttpServer
                 return; // never log these; they're just binary data
 
             Stream inputStream = Util.Copy(request.InputStream);
-
+            Stream innerStream = null;
+            try
+            {
                 if ((request.Headers["Content-Encoding"] == "gzip") || (request.Headers["X-Content-Encoding"] == "gzip"))
-                inputStream = new GZipStream(inputStream, System.IO.Compression.CompressionMode.Decompress);
+                {
+                    innerStream = inputStream;
+                    inputStream = new GZipStream(innerStream, System.IO.Compression.CompressionMode.Decompress);
+                }
 
                 using (StreamReader reader = new StreamReader(inputStream, Encoding.UTF8))
                 {
@@ -856,6 +861,13 @@ namespace OpenSim.Framework.Servers.HttpServer
                     m_log.DebugFormat("[LOGHTTP] {0}", Util.BinaryToASCII(output));
                 }
             }
+            finally
+            {
+                if (innerStream != null)
+                    innerStream.Dispose();
+                inputStream.Dispose();
+            }
+        }
 
         private readonly string HANDLER_SEPARATORS = "/?&#-";
 
@@ -981,19 +993,33 @@ namespace OpenSim.Framework.Servers.HttpServer
         /// <param name="response"></param>
         private byte[] HandleXmlRpcRequests(OSHttpRequest request, OSHttpResponse response)
         {
+            String requestBody;
+
             Stream requestStream = request.InputStream;
-
+            Stream innerStream = null;
+            try
+            {
                 if ((request.Headers["Content-Encoding"] == "gzip") || (request.Headers["X-Content-Encoding"] == "gzip"))
-                requestStream = new GZipStream(requestStream, System.IO.Compression.CompressionMode.Decompress);
+                {
+                    innerStream = requestStream;
+                    requestStream = new GZipStream(innerStream, System.IO.Compression.CompressionMode.Decompress);
+                }
 
-            Encoding encoding = Encoding.UTF8;
+                using (StreamReader reader = new StreamReader(requestStream, Encoding.UTF8))
-            StreamReader reader = new StreamReader(requestStream, encoding);
+                {
+                    requestBody = reader.ReadToEnd();
+                }
+            }
+            finally
+            {
+                if (innerStream != null)
+                    innerStream.Dispose();
+                requestStream.Dispose();
+            }
 
-            string requestBody = reader.ReadToEnd();
-            reader.Close();
-            requestStream.Close();
             //m_log.Debug(requestBody);
             requestBody = requestBody.Replace("<base64></base64>", "");
+
             string responseString = String.Empty;
             XmlRpcRequest xmlRprcRequest = null;
 
@@ -1089,7 +1115,6 @@ namespace OpenSim.Framework.Servers.HttpServer
 
                     response.ContentType = "text/xml";
                     using (MemoryStream outs = new MemoryStream())
-                    {
                     using (XmlTextWriter writer = new XmlTextWriter(outs, Encoding.UTF8))
                     {
                         writer.Formatting = Formatting.None;
@@ -1103,7 +1128,6 @@ namespace OpenSim.Framework.Servers.HttpServer
                         }
                     }
                 }
-                }
                 else
                 {
                     //HandleLLSDRequests(request, response);

OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs

@@ -26,6 +26,7 @@
  */
 
 using System;
+using OpenSim.Framework.Monitoring;
 
 namespace OpenSim.Framework.Servers.HttpServer
 {
@@ -61,6 +62,24 @@ namespace OpenSim.Framework.Servers.HttpServer
             Description = description;
             m_httpMethod = httpMethod;
             m_path = path;
+
+            // FIXME: A very temporary measure to stop the simulator stats being overwhelmed with user CAPS info.
+            // Needs to be fixed properly in stats display
+            if (!path.StartsWith("/CAPS/"))
+            {
+                StatsManager.RegisterStat(
+                    new Stat(
+                    "requests", 
+                    "requests", 
+                    "Number of requests received by this service endpoint", 
+                    "requests", 
+                    "service", 
+                    string.Format("{0}:{1}", httpMethod, path), 
+                    StatType.Pull, 
+                    MeasuresOfInterest.AverageChangeOverTime,
+                    s => s.Value = RequestsReceived,
+                    StatVerbosity.Debug));
+            }
         }
 
         public virtual string Path

OpenSim/Framework/Servers/HttpServer/RestObjectPoster.cs

@@ -52,8 +52,8 @@ namespace OpenSim.Framework.Servers.HttpServer
             request.Method = verb;
             request.ContentType = "text/xml";
 
-            MemoryStream buffer = new MemoryStream();
+            using (MemoryStream buffer = new MemoryStream())
-
+            {
                 XmlWriterSettings settings = new XmlWriterSettings();
                 settings.Encoding = Encoding.UTF8;
 
@@ -64,11 +64,13 @@ namespace OpenSim.Framework.Servers.HttpServer
                     writer.Flush();
                 }
 
-            int length = (int) buffer.Length;
+                int length = (int)buffer.Length;
                 request.ContentLength = length;
 
-            Stream requestStream = request.GetRequestStream();
+                using (Stream requestStream = request.GetRequestStream())
                     requestStream.Write(buffer.ToArray(), 0, length);
+            }
+
             // IAsyncResult result = request.BeginGetResponse(AsyncCallback, request);
             request.BeginGetResponse(AsyncCallback, request);
         }

OpenSim/Framework/Servers/HttpServer/RestObjectPosterResponse.cs

@@ -60,8 +60,8 @@ namespace OpenSim.Framework.Servers.HttpServer
             request.ContentType = "text/xml";
             request.Timeout = 10000;
 
-            MemoryStream buffer = new MemoryStream();
+            using (MemoryStream buffer = new MemoryStream())
-
+            {
                 XmlWriterSettings settings = new XmlWriterSettings();
                 settings.Encoding = Encoding.UTF8;
 
@@ -72,12 +72,13 @@ namespace OpenSim.Framework.Servers.HttpServer
                     writer.Flush();
                 }
 
-            int length = (int) buffer.Length;
+                int length = (int)buffer.Length;
                 request.ContentLength = length;
 
-            Stream requestStream = request.GetRequestStream();
+                using (Stream requestStream = request.GetRequestStream())
                     requestStream.Write(buffer.ToArray(), 0, length);
-            requestStream.Close();
+            }
+
             // IAsyncResult result = request.BeginGetResponse(AsyncCallback, request);
             request.BeginGetResponse(AsyncCallback, request);
         }

OpenSim/Framework/Servers/HttpServer/RestSessionService.cs

@@ -77,8 +77,8 @@ namespace OpenSim.Framework.Servers.HttpServer
             request.ContentType = "text/xml";
             request.Timeout = 20000;
 
-            MemoryStream buffer = new MemoryStream();
+            using (MemoryStream buffer = new MemoryStream())
-
+            {
                 XmlWriterSettings settings = new XmlWriterSettings();
                 settings.Encoding = Encoding.UTF8;
 
@@ -92,10 +92,9 @@ namespace OpenSim.Framework.Servers.HttpServer
                 int length = (int)buffer.Length;
                 request.ContentLength = length;
 
-            Stream requestStream = request.GetRequestStream();
+                using (Stream requestStream = request.GetRequestStream())
                     requestStream.Write(buffer.ToArray(), 0, length);
-            buffer.Close();
+            }
-            requestStream.Close();
 
             TResponse deserial = default(TResponse);
             using (WebResponse resp = request.GetResponse())
@@ -133,8 +132,8 @@ namespace OpenSim.Framework.Servers.HttpServer
             request.ContentType = "text/xml";
             request.Timeout = 10000;
 
-            MemoryStream buffer = new MemoryStream();
+            using (MemoryStream buffer = new MemoryStream())
-
+            {
                 XmlWriterSettings settings = new XmlWriterSettings();
                 settings.Encoding = Encoding.UTF8;
 
@@ -144,14 +143,14 @@ namespace OpenSim.Framework.Servers.HttpServer
                     serializer.Serialize(writer, sobj);
                     writer.Flush();
                 }
-            buffer.Close();
 
                 int length = (int)buffer.Length;
                 request.ContentLength = length;
 
-            Stream requestStream = request.GetRequestStream();
+                using (Stream requestStream = request.GetRequestStream())
                     requestStream.Write(buffer.ToArray(), 0, length);
-            requestStream.Close();
+            }
+
             // IAsyncResult result = request.BeginGetResponse(AsyncCallback, request);
             request.BeginGetResponse(AsyncCallback, request);
         }

OpenSim/Framework/Servers/VersionInfo.cs

@@ -29,8 +29,8 @@ namespace OpenSim
 {
     public class VersionInfo
     {
-        private const string VERSION_NUMBER = "0.8.0";
+        private const string VERSION_NUMBER = "0.8.0.2";
-        private const Flavour VERSION_FLAVOUR = Flavour.Dev;
+        private const Flavour VERSION_FLAVOUR = Flavour.Post_Fixes;
 
         public enum Flavour
         {
@@ -38,6 +38,7 @@ namespace OpenSim
             Dev,
             RC1,
             RC2,
+            RC3,
             Release,
             Post_Fixes,
             Extended

OpenSim/Framework/ThreadSafeRandom.cs

@@ -0,0 +1,72 @@
+/*
+ * 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;
+
+namespace OpenSim.Framework
+{
+    /// <summary>
+    /// A thread-safe Random since the .NET version is not.
+    /// See http://msdn.microsoft.com/en-us/library/system.random%28v=vs.100%29.aspx
+    /// </summary>
+    public class ThreadSafeRandom : Random
+    {
+        public ThreadSafeRandom() : base() {}
+
+        public ThreadSafeRandom(int seed): base (seed) {}
+
+        public override int Next()
+        {
+            lock (this)
+                return base.Next();
+        }
+
+        public override int Next(int maxValue)
+        {
+            lock (this)
+                return base.Next(maxValue);
+        }
+
+        public override int Next(int minValue, int maxValue)
+        {
+            lock (this)
+                return base.Next(minValue, maxValue);
+        }
+
+        public override void NextBytes(byte[] buffer)
+        {
+            lock (this)
+                base.NextBytes(buffer);
+        }
+
+        public override double NextDouble()
+        {
+            lock (this)
+                return base.NextDouble();
+        }
+    }
+}

OpenSim/Framework/Util.cs

@@ -138,7 +138,7 @@ namespace OpenSim.Framework
         }
 
         private static uint nextXferID = 5000;
-        private static Random randomClass = new Random();
+        private static Random randomClass = new ThreadSafeRandom();
 
         // Get a list of invalid file characters (OS dependent)
         private static string regexInvalidFileChars = "[" + new String(Path.GetInvalidFileNameChars()) + "]";
@@ -509,6 +509,19 @@ namespace OpenSim.Framework
             return sb.ToString();
         }
 
+        public static byte[] DocToBytes(XmlDocument doc)
+        {
+            using (MemoryStream ms = new MemoryStream())
+            using (XmlTextWriter xw = new XmlTextWriter(ms, null))
+            {
+                xw.Formatting = Formatting.Indented;
+                doc.WriteTo(xw);
+                xw.Flush();
+
+                return ms.ToArray();
+            }
+        }
+
         /// <summary>
         /// Is the platform Windows?
         /// </summary>
@@ -1307,46 +1320,6 @@ namespace OpenSim.Framework
             return ret;
         }
 
-        public static string Compress(string text)
-        {
-            byte[] buffer = Util.UTF8.GetBytes(text);
-            MemoryStream memory = new MemoryStream();
-            using (GZipStream compressor = new GZipStream(memory, CompressionMode.Compress, true))
-            {
-                compressor.Write(buffer, 0, buffer.Length);
-            }
-
-            memory.Position = 0;
-           
-            byte[] compressed = new byte[memory.Length];
-            memory.Read(compressed, 0, compressed.Length);
-
-            byte[] compressedBuffer = new byte[compressed.Length + 4];
-            Buffer.BlockCopy(compressed, 0, compressedBuffer, 4, compressed.Length);
-            Buffer.BlockCopy(BitConverter.GetBytes(buffer.Length), 0, compressedBuffer, 0, 4);
-            return Convert.ToBase64String(compressedBuffer);
-        }
-
-        public static string Decompress(string compressedText)
-        {
-            byte[] compressedBuffer = Convert.FromBase64String(compressedText);
-            using (MemoryStream memory = new MemoryStream())
-            {
-                int msgLength = BitConverter.ToInt32(compressedBuffer, 0);
-                memory.Write(compressedBuffer, 4, compressedBuffer.Length - 4);
-
-                byte[] buffer = new byte[msgLength];
-
-                memory.Position = 0;
-                using (GZipStream decompressor = new GZipStream(memory, CompressionMode.Decompress))
-                {
-                    decompressor.Read(buffer, 0, buffer.Length);
-                }
-
-                return Util.UTF8.GetString(buffer);
-            }
-        }
-
         /// <summary>
         /// Copy data from one stream to another, leaving the read position of both streams at the beginning.
         /// </summary>
@@ -1964,10 +1937,15 @@ namespace OpenSim.Framework
         {
             if (maxThreads < 2)
                 throw new ArgumentOutOfRangeException("maxThreads", "maxThreads must be greater than 2");
+
             if (minThreads > maxThreads || minThreads < 2)
                 throw new ArgumentOutOfRangeException("minThreads", "minThreads must be greater than 2 and less than or equal to maxThreads");
+
             if (m_ThreadPool != null)
-                throw new InvalidOperationException("SmartThreadPool is already initialized");
+            {
+                m_log.Warn("SmartThreadPool is already initialized.  Ignoring request.");
+                return;
+            }
 
             STPStartInfo startInfo = new STPStartInfo();
             startInfo.ThreadPoolName = "Util";
@@ -2621,7 +2599,7 @@ namespace OpenSim.Framework
         }
 
         #region Xml Serialization Utilities
-        public static bool ReadBoolean(XmlTextReader reader)
+        public static bool ReadBoolean(XmlReader reader)
         {
             // AuroraSim uses "int" for some fields that are boolean in OpenSim, e.g. "PassCollisions". Don't fail because of this.
             reader.ReadStartElement();
@@ -2632,7 +2610,7 @@ namespace OpenSim.Framework
             return result;
         }
 
-        public static UUID ReadUUID(XmlTextReader reader, string name)
+        public static UUID ReadUUID(XmlReader reader, string name)
         {
             UUID id;
             string idStr;
@@ -2651,7 +2629,7 @@ namespace OpenSim.Framework
             return id;
         }
 
-        public static Vector3 ReadVector(XmlTextReader reader, string name)
+        public static Vector3 ReadVector(XmlReader reader, string name)
         {
             Vector3 vec;
 
@@ -2664,7 +2642,7 @@ namespace OpenSim.Framework
             return vec;
         }
 
-        public static Quaternion ReadQuaternion(XmlTextReader reader, string name)
+        public static Quaternion ReadQuaternion(XmlReader reader, string name)
         {
             Quaternion quat = new Quaternion();
 
@@ -2693,7 +2671,7 @@ namespace OpenSim.Framework
             return quat;
         }
 
-        public static T ReadEnum<T>(XmlTextReader reader, string name)
+        public static T ReadEnum<T>(XmlReader reader, string name)
         {
             string value = reader.ReadElementContentAsString(name, String.Empty);
             // !!!!! to deal with flags without commas

OpenSim/Framework/WebUtil.cs

@@ -69,7 +69,7 @@ namespace OpenSim.Framework
         /// <summary>
         /// Request number for diagnostic purposes.
         /// </summary>
-        public static int RequestNumber { get; internal set; }
+        public static int RequestNumber { get; set; }
 
         /// <summary>
         /// Control where OSD requests should be serialized per endpoint.
@@ -176,7 +176,8 @@ namespace OpenSim.Framework
 
         public static void LogOutgoingDetail(string context, Stream outputStream)
         {
-            using (StreamReader reader = new StreamReader(Util.Copy(outputStream), Encoding.UTF8))
+            using (Stream stream = Util.Copy(outputStream))
+            using (StreamReader reader = new StreamReader(stream, Encoding.UTF8))
             {
                 string output;
 
@@ -262,12 +263,12 @@ namespace OpenSim.Framework
 
                         using (MemoryStream ms = new MemoryStream())
                         {
-                            using (GZipStream comp = new GZipStream(ms, CompressionMode.Compress))
+                            using (GZipStream comp = new GZipStream(ms, CompressionMode.Compress, true))
                             {
                                 comp.Write(buffer, 0, buffer.Length);
                                 // We need to close the gzip stream before we write it anywhere
                                 // because apparently something important related to gzip compression
-                                // gets written on the strteam upon Dispose()
+                                // gets written on the stream upon Dispose()
                             }
                             byte[] buf = ms.ToArray();
                             request.ContentLength = buf.Length;   //Count bytes to send

OpenSim/Region/Application/OpenSim.cs

@@ -921,7 +921,7 @@ namespace OpenSim
 
                             foreach (IRegionModuleBase module in scene.RegionModules.Values)
                             {
-                                if (module.GetType().GetInterface("ISharedRegionModule") != null)
+                                if (module.GetType().GetInterface("ISharedRegionModule") == null)
                                     nonSharedModules.Add(module);
                                 else
                                     sharedModules.Add(module);
@@ -943,6 +943,7 @@ namespace OpenSim
                     cdt.AddColumn("Name", ConsoleDisplayUtil.RegionNameSize);
                     cdt.AddColumn("ID", ConsoleDisplayUtil.UuidSize);
                     cdt.AddColumn("Position", ConsoleDisplayUtil.CoordTupleSize);
+                    cdt.AddColumn("Size", 11);
                     cdt.AddColumn("Port", ConsoleDisplayUtil.PortSize);
                     cdt.AddColumn("Ready?", 6);
                     cdt.AddColumn("Estate", ConsoleDisplayUtil.EstateNameSize);
@@ -951,8 +952,13 @@ namespace OpenSim
                         { 
                             RegionInfo ri = scene.RegionInfo; 
                             cdt.AddRow(
-                                ri.RegionName, ri.RegionID, string.Format("{0},{1}", ri.RegionLocX, ri.RegionLocY), 
+                                ri.RegionName, 
-                                ri.InternalEndPoint.Port, scene.Ready ? "Yes" : "No", ri.EstateSettings.EstateName);
+                                ri.RegionID, 
+                                string.Format("{0},{1}", ri.RegionLocX, ri.RegionLocY), 
+                                string.Format("{0}x{1}", ri.RegionSizeX, ri.RegionSizeY),
+                                ri.InternalEndPoint.Port, 
+                                scene.Ready ? "Yes" : "No", 
+                                ri.EstateSettings.EstateName);
                         }
                     );
 

OpenSim/Region/Application/OpenSimBase.cs

@@ -71,6 +71,20 @@ namespace OpenSim
         // OpenSim.ini Section name for ESTATES Settings
         public const string ESTATE_SECTION_NAME = "Estates";
 
+        /// <summary>
+        /// Allow all plugin loading to be disabled for tests/debug.
+        /// </summary>
+        /// <remarks>
+        /// true by default
+        /// </remarks>
+        public bool EnableInitialPluginLoad { get; set; }
+
+        /// <summary>
+        /// Control whether we attempt to load an estate data service.
+        /// </summary>
+        /// <remarks>For tests/debugging</remarks>
+        public bool LoadEstateDataService { get; set; }
+
         protected string proxyUrl;
         protected int proxyOffset = 0;
         
@@ -96,7 +110,7 @@ namespace OpenSim
 
         public ConsoleCommand CreateAccount = null;
 
-        protected List<IApplicationPlugin> m_plugins = new List<IApplicationPlugin>();
+        public List<IApplicationPlugin> m_plugins = new List<IApplicationPlugin>();
 
         /// <value>
         /// The config information passed into the OpenSimulator region server.
@@ -135,6 +149,8 @@ namespace OpenSim
         /// <param name="configSource"></param>
         public OpenSimBase(IConfigSource configSource) : base()
         {
+            EnableInitialPluginLoad = true;
+            LoadEstateDataService = true;
             LoadConfigSettings(configSource);
         }
 
@@ -240,20 +256,25 @@ namespace OpenSim
             if (String.IsNullOrEmpty(module))
                 throw new Exception("Configuration file is missing the LocalServiceModule parameter in the [EstateDataStore] section");
 
+            if (LoadEstateDataService)
+            {
                 m_estateDataService = ServerUtils.LoadPlugin<IEstateDataService>(module, new object[] { Config });
                 if (m_estateDataService == null)
                     throw new Exception(
                         string.Format(
                             "Could not load an IEstateDataService implementation from {0}, as configured in the LocalServiceModule parameter of the [EstateDataStore] config section.", 
                             module));
+            }
 
             base.StartupSpecific();
 
+            if (EnableInitialPluginLoad)
                 LoadPlugins();
+
+            // We still want to post initalize any plugins even if loading has been disabled since a test may have
+            // inserted them manually.
             foreach (IApplicationPlugin plugin in m_plugins)
-            {
                 plugin.PostInitialise();
-            }
 
             if (m_console != null)
                 AddPluginCommands(m_console);
@@ -713,8 +734,6 @@ namespace OpenSim
             clientServer = clientNetworkServers;
             scene.LoadWorldMap();
 
-            Vector3 regionExtent = new Vector3(regionInfo.RegionSizeX, regionInfo.RegionSizeY, regionInfo.RegionSizeZ);
-            scene.PhysicsScene = GetPhysicsScene(scene.RegionInfo.RegionName, regionExtent);
             scene.PhysicsScene.RequestAssetMethod = scene.PhysicsRequestAsset;
             scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised());
             scene.PhysicsScene.SetWaterLevel((float) regionInfo.RegionSettings.WaterHeight);
@@ -730,10 +749,13 @@ namespace OpenSim
         protected override Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService,
             IEstateDataService estateDataService, AgentCircuitManager circuitManager)
         {
+            Vector3 regionExtent = new Vector3(regionInfo.RegionSizeX, regionInfo.RegionSizeY, regionInfo.RegionSizeZ);
+            PhysicsScene physicsScene = GetPhysicsScene(regionInfo.RegionName, regionExtent);
+
             SceneCommunicationService sceneGridService = new SceneCommunicationService();
 
             return new Scene(
-                regionInfo, circuitManager, sceneGridService,
+                regionInfo, circuitManager, physicsScene, sceneGridService,
                 simDataService, estateDataService,
                 Config, m_version);
         }
@@ -878,6 +900,9 @@ namespace OpenSim
             try
             {
                 SceneManager.Close();
+
+                foreach (IApplicationPlugin plugin in m_plugins)
+                    plugin.Dispose();
             }
             catch (Exception e)
             {

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

@@ -44,6 +44,7 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Framework.Client;
 using OpenSim.Services.Interfaces;
 
 using Caps = OpenSim.Framework.Capabilities.Caps;
@@ -536,6 +537,42 @@ namespace OpenSim.Region.ClientStack.Linden
                 OSDArray texture_list = (OSDArray)request["texture_list"];
                 SceneObjectGroup grp = null;
 
+                InventoryFolderBase textureUploadFolder = null;
+
+                List<InventoryFolderBase> foldersToUpdate = new List<InventoryFolderBase>();
+                List<InventoryItemBase> itemsToUpdate = new List<InventoryItemBase>();
+                IClientInventory clientInv = null;
+                
+                if (texture_list.Count > 0)
+                {
+                    ScenePresence avatar = null;
+                    IClientAPI client = null;
+                    m_Scene.TryGetScenePresence(m_HostCapsObj.AgentID, out avatar);
+
+                    if (avatar != null)
+                    {
+                        IClientCore core = (IClientCore)avatar.ControllingClient;
+
+                        if (core.TryGet<IClientInventory>(out clientInv))
+                        {
+                            var systemTextureFolder = m_Scene.InventoryService.GetFolderForType(m_HostCapsObj.AgentID, AssetType.Texture);
+                            textureUploadFolder = new InventoryFolderBase(UUID.Random(), assetName, m_HostCapsObj.AgentID, (short)AssetType.Unknown, systemTextureFolder.ID, 1);
+                            if (m_Scene.InventoryService.AddFolder(textureUploadFolder))
+                            {
+                                foldersToUpdate.Add(textureUploadFolder);
+
+                                m_log.DebugFormat(
+                                    "[BUNCH OF CAPS]: Created new folder '{0}' ({1}) for textures uploaded with mesh object {2}", 
+                                    textureUploadFolder.Name, textureUploadFolder.ID, assetName);
+                            }
+                            else
+                            {
+                                textureUploadFolder = null;
+                            }
+                        }
+                    }
+                }
+
                 List<UUID> textures = new List<UUID>();
                 for (int i = 0; i < texture_list.Count; i++)
                 {
@@ -543,6 +580,38 @@ namespace OpenSim.Region.ClientStack.Linden
                     textureAsset.Data = texture_list[i].AsBinary();
                     m_assetService.Store(textureAsset);
                     textures.Add(textureAsset.FullID);
+
+                    if (textureUploadFolder != null)
+                    {
+                        InventoryItemBase textureItem = new InventoryItemBase();
+                        textureItem.Owner = m_HostCapsObj.AgentID;
+                        textureItem.CreatorId = m_HostCapsObj.AgentID.ToString();
+                        textureItem.CreatorData = String.Empty;
+                        textureItem.ID = UUID.Random();
+                        textureItem.AssetID = textureAsset.FullID;
+                        textureItem.Description = assetDescription;
+                        textureItem.Name = assetName + " - Texture " + (i + 1).ToString();
+                        textureItem.AssetType = (int)AssetType.Texture;
+                        textureItem.InvType = (int)InventoryType.Texture;
+                        textureItem.Folder = textureUploadFolder.ID;
+                        textureItem.CurrentPermissions
+                            = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer | PermissionMask.Export);
+                        textureItem.BasePermissions = (uint)PermissionMask.All | (uint)PermissionMask.Export;
+                        textureItem.EveryOnePermissions = 0;
+                        textureItem.NextPermissions = (uint)PermissionMask.All;
+                        textureItem.CreationDate = Util.UnixTimeSinceEpoch();
+                        m_Scene.InventoryService.AddItem(textureItem);
+                        itemsToUpdate.Add(textureItem);
+
+                        m_log.DebugFormat(
+                            "[BUNCH OF CAPS]: Created new inventory item '{0}' ({1}) for texture uploaded with mesh object {2}", 
+                            textureItem.Name, textureItem.ID, assetName);
+                    }
+                }
+
+                if (clientInv != null && (foldersToUpdate.Count > 0 || itemsToUpdate.Count > 0))
+                {
+                    clientInv.SendBulkUpdateInventory(foldersToUpdate.ToArray(), itemsToUpdate.ToArray());
                 }
 
                 for (int i = 0; i < mesh_list.Count; i++)

OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs

@@ -101,7 +101,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 "debug eq [0|1|2]",
                 "Turn on event queue debugging\n"
                     + "  <= 0 - turns off all event queue logging\n"
-                    + "  >= 1 - turns on outgoing event logging\n"
+                    + "  >= 1 - turns on event queue setup and outgoing event logging\n"
                     + "  >= 2 - turns on poll notification",
                 HandleDebugEq);
 
@@ -188,9 +188,11 @@ namespace OpenSim.Region.ClientStack.Linden
             {
                 if (!queues.ContainsKey(agentId))
                 {
+                    if (DebugLevel > 0)
                         m_log.DebugFormat(
                             "[EVENTQUEUE]: Adding new queue for agent {0} in region {1}", 
                             agentId, m_scene.RegionInfo.RegionName);
+
                     queues[agentId] = new Queue<OSD>();
                 }
 
@@ -302,6 +304,7 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             // Register an event queue for the client
 
+            if (DebugLevel > 0)
                 m_log.DebugFormat(
                     "[EVENTQUEUE]: OnRegisterCaps: agentID {0} caps {1} region {2}",
                     agentID, caps, m_scene.RegionInfo.RegionName);
@@ -720,8 +723,9 @@ namespace OpenSim.Region.ClientStack.Linden
 
         public virtual void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY)
         {
-            m_log.DebugFormat("{0} EnableSimulator. handle={1}, avatarID={2}, regionSize={3},{4}>",
+            if (DebugLevel > 0)
-                LogHeader, handle, avatarID, regionSizeX, regionSizeY);
+                m_log.DebugFormat("{0} EnableSimulator. handle={1}, endPoint={2}, avatarID={3}",
+                    LogHeader, handle, endPoint, avatarID, regionSizeX, regionSizeY);
 
             OSD item = EventQueueHelper.EnableSimulator(handle, endPoint, regionSizeX, regionSizeY);
             Enqueue(item, avatarID);
@@ -730,8 +734,10 @@ namespace OpenSim.Region.ClientStack.Linden
         public virtual void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, string capsPath,
                                 ulong regionHandle, int regionSizeX, int regionSizeY) 
         {
-            m_log.DebugFormat("{0} EstablishAgentCommunication. handle={1}, avatarID={2}, regionSize={3},{4}>",
+            if (DebugLevel > 0)
-                LogHeader, regionHandle, avatarID, regionSizeX, regionSizeY);
+                m_log.DebugFormat("{0} EstablishAgentCommunication. handle={1}, endPoint={2}, avatarID={3}",
+                    LogHeader, regionHandle, endPoint, avatarID, regionSizeX, regionSizeY);
+
             OSD item = EventQueueHelper.EstablishAgentCommunication(avatarID, endPoint.ToString(), capsPath, regionHandle, regionSizeX, regionSizeY);
             Enqueue(item, avatarID);
         }
@@ -741,8 +747,9 @@ namespace OpenSim.Region.ClientStack.Linden
                                         uint locationID, uint flags, string capsURL, 
                                         UUID avatarID, int regionSizeX, int regionSizeY)
         {
-            m_log.DebugFormat("{0} TeleportFinishEvent. handle={1}, avatarID={2}, regionSize=<{3},{4}>",
+            if (DebugLevel > 0)
-                LogHeader, regionHandle, avatarID, regionSizeX, regionSizeY);
+                m_log.DebugFormat("{0} TeleportFinishEvent. handle={1}, endPoint={2}, avatarID={3}",
+                    LogHeader, regionHandle, regionExternalEndPoint, avatarID, regionSizeX, regionSizeY);
 
             OSD item = EventQueueHelper.TeleportFinishEvent(regionHandle, simAccess, regionExternalEndPoint,
                                                             locationID, flags, capsURL, avatarID, regionSizeX, regionSizeY);
@@ -753,6 +760,7 @@ namespace OpenSim.Region.ClientStack.Linden
                                 IPEndPoint newRegionExternalEndPoint,
                                 string capsURL, UUID avatarID, UUID sessionID, int regionSizeX, int regionSizeY)
         {
+            if (DebugLevel > 0)
                 m_log.DebugFormat("{0} CrossRegion. handle={1}, avatarID={2}, regionSize={3},{4}>",
                     LogHeader, handle, avatarID, regionSizeX, regionSizeY);
 

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

@@ -63,8 +63,7 @@ namespace OpenSim.Region.ClientStack.Linden
             public List<UUID> folders;
         }
 
-        // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
 
         /// <summary>
         /// Control whether requests will be processed asynchronously.
@@ -438,7 +437,18 @@ namespace OpenSim.Region.ClientStack.Linden
             aPollRequest poolreq = m_queue.Dequeue();
 
             if (poolreq != null && poolreq.thepoll != null)
+            {
+                try
+                {
                     poolreq.thepoll.Process(poolreq);
                 }
+                catch (Exception e)
+                {
+                    m_log.ErrorFormat(
+                        "[INVENTORY]: Failed to process queued inventory request {0} for {1} in {2}.  Exception {3}", 
+                        poolreq.reqID, poolreq.presence != null ? poolreq.presence.Name : "unknown", Scene.Name, e);
+                }
+            }
+        }
     }
 }

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

@@ -1467,10 +1467,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 mapReply.Data[i].Access = mapBlocks2[i].Access;
                 mapReply.Data[i].Agents = mapBlocks2[i].Agents;
 
-                // TODO: hookup varregion sim size here
                 mapReply.Size[i] = new MapBlockReplyPacket.SizeBlock();
-                mapReply.Size[i].SizeX = 256;
+                mapReply.Size[i].SizeX = mapBlocks2[i].SizeX;
-                mapReply.Size[i].SizeY = 256;
+                mapReply.Size[i].SizeY = mapBlocks2[i].SizeY;
             }
             OutPacket(mapReply, ThrottleOutPacketType.Land);
         }
@@ -4126,6 +4125,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 }
             }
 
+//            m_log.DebugFormat(
+//                "[LLCLIENTVIEW]: Sent {0} updates in ProcessEntityUpdates() for {1} {2} in {3}", 
+//                updatesThisCall, Name, SceneAgent.IsChildAgent ? "child" : "root", Scene.Name);
+//
             #endregion Packet Sending
         }
 
@@ -11773,7 +11776,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <returns></returns>
         protected bool HandleAgentTextureCached(IClientAPI simclient, Packet packet)
         {
-            //m_log.Debug("texture cached: " + packet.ToString());
             AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet;
             AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse);
 
@@ -11789,24 +11791,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             cachedresp.WearableData =
                 new AgentCachedTextureResponsePacket.WearableDataBlock[cachedtex.WearableData.Length];
 
-            //IAvatarFactoryModule fac = m_scene.RequestModuleInterface<IAvatarFactoryModule>();
-           // var item = fac.GetBakedTextureFaces(AgentId);
-            //WearableCacheItem[] items = fac.GetCachedItems(AgentId);
-
-            IAssetService cache = m_scene.AssetService;
-            IBakedTextureModule bakedTextureModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
-            //bakedTextureModule = null;
             int maxWearablesLoop = cachedtex.WearableData.Length;
             if (maxWearablesLoop > AvatarWearable.MAX_WEARABLES)
                 maxWearablesLoop = AvatarWearable.MAX_WEARABLES;
 
-            if (bakedTextureModule != null && cache != null)
+            // Find the cached baked textures for this user, if they're available
-            {
+
-                // We need to make sure the asset stored in the bake is available on this server also by it's assetid before we map it to a Cacheid
+            IAssetService cache = m_scene.AssetService;
+            IBakedTextureModule bakedTextureModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
             
             WearableCacheItem[] cacheItems = null;
+
+            if (bakedTextureModule != null && cache != null)
+            {
                 ScenePresence p = m_scene.GetScenePresence(AgentId);
                 if (p.Appearance != null)
+                {
                     if (p.Appearance.WearableCacheItems == null || p.Appearance.WearableCacheItemsDirty)
                     {
                         try
@@ -11815,22 +11815,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             p.Appearance.WearableCacheItems = cacheItems;
                             p.Appearance.WearableCacheItemsDirty = false;
                         }
-
-                        /*
-                         * The following Catch types DO NOT WORK, it jumps to the General Packet Exception Handler if you don't catch Exception!
-                         * 
-                        catch (System.Net.Sockets.SocketException)
-                        {
-                            cacheItems = null;
-                        }
-                        catch (WebException)
-                        {
-                            cacheItems = null;
-                        }
-                        catch (InvalidOperationException)
-                        {
-                            cacheItems = null;
-                        } */
                         catch (Exception)
                         {
                             cacheItems = null;
@@ -11841,35 +11825,34 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     {
                         cacheItems = p.Appearance.WearableCacheItems;
                     }
+                }
+            }
 
-                if (cache != null && cacheItems != null)
+            if (cacheItems != null)
             {
+                // We need to make sure the asset stored in the bake is available on this server also by its assetid before we map it to a Cacheid.
+                // Copy the baked textures to the sim's assets cache (local only).
                 foreach (WearableCacheItem item in cacheItems)
                 {
-
                     if (cache.GetCached(item.TextureID.ToString()) == null)
                     {
                         item.TextureAsset.Temporary = true;
+                        item.TextureAsset.Local = true;
                         cache.Store(item.TextureAsset);
                     }
-
-
                 }
-                }
-                if (cacheItems != null)
-                {
 
+                // Return the cached textures
                 for (int i = 0; i < maxWearablesLoop; i++)
                 {
                     WearableCacheItem item =
-                            WearableCacheItem.SearchTextureIndex(cachedtex.WearableData[i].TextureIndex,cacheItems);
+                        WearableCacheItem.SearchTextureIndex(cachedtex.WearableData[i].TextureIndex, cacheItems);
 
                     cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
-                        cachedresp.WearableData[i].TextureIndex= cachedtex.WearableData[i].TextureIndex;
+                    cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
                     cachedresp.WearableData[i].HostName = new byte[0];
                     if (item != null && cachedtex.WearableData[i].ID == item.CacheId)
                     {
-
                         cachedresp.WearableData[i].TextureID = item.TextureID;
                     }
                     else
@@ -11880,48 +11863,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
             else
             {
+                // Cached textures not available
                 for (int i = 0; i < maxWearablesLoop; i++)
                 {
                     cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
                     cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
                     cachedresp.WearableData[i].TextureID = UUID.Zero;
-                        //UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
                     cachedresp.WearableData[i].HostName = new byte[0];
                 }
             }
-            }
-            else
-            {
-                if (cache == null)
-                {
-                    for (int i = 0; i < maxWearablesLoop; i++)
-                    {
-                        cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
-                        cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
-                        cachedresp.WearableData[i].TextureID = UUID.Zero;
-                            //UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
-                        cachedresp.WearableData[i].HostName = new byte[0];
-                    }
-                }
-                else
-                {
-                    for (int i = 0; i < maxWearablesLoop; i++)
-                    {
-                        cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
-                        cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
             
-
-
-                        if (cache.GetCached(cachedresp.WearableData[i].TextureID.ToString()) == null)
-                            cachedresp.WearableData[i].TextureID = UUID.Zero;
-                            //UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
-                        else
-                            cachedresp.WearableData[i].TextureID = UUID.Zero;
-                                // UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
-                        cachedresp.WearableData[i].HostName = new byte[0];
-                    }
-                }
-            }
             cachedresp.Header.Zerocoded = true;
             OutPacket(cachedresp, ThrottleOutPacketType.Task);
 
@@ -12314,6 +12265,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// provide your own method.</param>
         protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting, UnackedPacketMethod method)
         {
+            if (m_outPacketsToDrop != null)
+                if (m_outPacketsToDrop.Contains(packet.Type.ToString()))
+                    return;
+
             if (DebugPacketLevel > 0)
             {
                 bool logPacket = true;
@@ -12372,6 +12327,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="Pack">OpenMetaverse.packet</param>
         public void ProcessInPacket(Packet packet)
         {
+            if (m_inPacketsToDrop != null)
+                if (m_inPacketsToDrop.Contains(packet.Type.ToString()))
+                    return;
+
             if (DebugPacketLevel > 0)
             {
                 bool logPacket = true;
@@ -13096,5 +13055,51 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             eq.Enqueue(BuildEvent("BulkUpdateInventory",
                     llsd), AgentId);
         }
+
+        private HashSet<string> m_outPacketsToDrop;
+
+        public bool AddOutPacketToDropSet(string packetName)
+        {
+            if (m_outPacketsToDrop == null)
+                m_outPacketsToDrop = new HashSet<string>();
+
+            return m_outPacketsToDrop.Add(packetName);
+        }
+
+        public bool RemoveOutPacketFromDropSet(string packetName)
+        {
+            if (m_outPacketsToDrop == null)
+                return false;
+
+            return m_outPacketsToDrop.Remove(packetName);
+        }
+
+        public HashSet<string> GetOutPacketDropSet()
+        {
+            return new HashSet<string>(m_outPacketsToDrop);
+        }
+
+        private HashSet<string> m_inPacketsToDrop;
+
+        public bool AddInPacketToDropSet(string packetName)
+        {
+            if (m_inPacketsToDrop == null)
+                m_inPacketsToDrop = new HashSet<string>();
+
+            return m_inPacketsToDrop.Add(packetName);
+        }
+
+        public bool RemoveInPacketFromDropSet(string packetName)
+        {
+            if (m_inPacketsToDrop == null)
+                return false;
+
+            return m_inPacketsToDrop.Remove(packetName);
+        }
+
+        public HashSet<string> GetInPacketDropSet()
+        {
+            return new HashSet<string>(m_inPacketsToDrop);
+        }
     }
 }

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

@@ -202,7 +202,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             // Create a token bucket throttle for this client that has the scene token bucket as a parent
             m_throttleClient = new AdaptiveTokenBucket(parentThrottle, rates.Total, rates.AdaptiveThrottlesEnabled);
-            // Create a token bucket throttle for the total categary with the client bucket as a throttle
+            // Create a token bucket throttle for the total category with the client bucket as a throttle
             m_throttleCategory = new TokenBucket(m_throttleClient, 0);
             // Create an array of token buckets for this clients different throttle categories
             m_throttleCategories = new TokenBucket[THROTTLE_CATEGORY_COUNT];
@@ -262,6 +262,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_info.assetThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Asset].DripRate;
             m_info.textureThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Texture].DripRate;
             m_info.totalThrottle = (int)m_throttleCategory.DripRate;
+            m_info.maxThrottle = (int)m_throttleClient.MaxDripRate;
 
             return m_info;
         }
@@ -648,11 +649,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 m_categories = categories;
 
                 if (HasUpdates(m_categories))
+                {
+                    if (!m_udpServer.OqrEngine.IsRunning)
                     {
                         // Asynchronously run the callback
                         Util.FireAndForget(FireQueueEmpty, categories);
                     }
                     else
+                    {
+                        m_udpServer.OqrEngine.QueueRequest(this, categories);
+                    }
+                }
+                else
                 {
                     m_isQueueEmptyRunning = false;
                 }
@@ -669,8 +677,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="o">Throttle categories to fire the callback for,
         /// stored as an object to match the WaitCallback delegate
         /// signature</param>
-        private void FireQueueEmpty(object o)
+        public void FireQueueEmpty(object o)
         {
+//            m_log.DebugFormat("[LLUDPCLIENT]: FireQueueEmpty for {0} in {1}", AgentID, m_udpServer.Scene.Name);
+
 //            int start = Environment.TickCount & Int32.MaxValue;
 //            const int MIN_CALLBACK_MS = 30;
 

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

@@ -250,7 +250,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private AgentCircuitManager m_circuitManager;
 
         /// <summary>Reference to the scene this UDP server is attached to</summary>
-        protected Scene m_scene;
+        public Scene Scene { get; private set; }
 
         /// <summary>The X/Y coordinates of the scene this UDP server is attached to</summary>
         private Location m_location;
@@ -355,6 +355,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// </summary>
         private IClientAPI m_currentIncomingClient;
 
+        /// <summary>
+        /// Experimental facility to run queue empty processing within a controlled number of threads rather than
+        /// requiring massive numbers of short-lived threads from the threadpool when there are a high number of 
+        /// connections.
+        /// </summary>
+        public OutgoingQueueRefillEngine OqrEngine { get; private set; }
+
         public LLUDPServer(
             IPAddress listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port,
             IConfigSource configSource, AgentCircuitManager circuitManager)
@@ -432,12 +439,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             if (usePools)
                 EnablePools();
+
+            OqrEngine = new OutgoingQueueRefillEngine(this);
         }
 
         public void Start()
         {
             StartInbound();
             StartOutbound();
+            OqrEngine.Start();
 
             m_elapsedMSSinceLastStatReport = Environment.TickCount;
         }
@@ -453,7 +463,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // This thread will process the packets received that are placed on the packetInbox
             Watchdog.StartThread(
                 IncomingPacketHandler,
-                string.Format("Incoming Packets ({0})", m_scene.RegionInfo.RegionName),
+                string.Format("Incoming Packets ({0})", Scene.Name),
                 ThreadPriority.Normal,
                 false,
                 true,
@@ -469,7 +479,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             Watchdog.StartThread(
                 OutgoingPacketHandler,
-                string.Format("Outgoing Packets ({0})", m_scene.RegionInfo.RegionName),
+                string.Format("Outgoing Packets ({0})", Scene.Name),
                 ThreadPriority.Normal,
                 false,
                 true,
@@ -479,9 +489,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public void Stop()
         {
-            m_log.Info("[LLUDPSERVER]: Shutting down the LLUDP server for " + m_scene.RegionInfo.RegionName);
+            m_log.Info("[LLUDPSERVER]: Shutting down the LLUDP server for " + Scene.Name);
             base.StopOutbound();
             base.StopInbound();
+            OqrEngine.Stop();
         }
 
         protected override bool EnablePools()
@@ -527,7 +538,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     "The number of objects currently stored within the UDPPacketBuffer pool",
                     "",
                     "clientstack",
-                    m_scene.Name,
+                    Scene.Name,
                     StatType.Pull,
                     stat => stat.Value = Pool.Count,
                     StatVerbosity.Debug);
@@ -541,7 +552,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     "The number of objects currently stored within the incoming packet pool",
                     "",
                     "clientstack",
-                    m_scene.Name,
+                    Scene.Name,
                     StatType.Pull,
                     stat => stat.Value = m_incomingPacketPool.Count,
                     StatVerbosity.Debug);
@@ -585,7 +596,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public void AddScene(IScene scene)
         {
-            if (m_scene != null)
+            if (Scene != null)
             {
                 m_log.Error("[LLUDPSERVER]: AddScene() called on an LLUDPServer that already has a scene");
                 return;
@@ -597,8 +608,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 return;
             }
 
-            m_scene = (Scene)scene;
+            Scene = (Scene)scene;
-            m_location = new Location(m_scene.RegionInfo.RegionHandle);
+            m_location = new Location(Scene.RegionInfo.RegionHandle);
 
             StatsManager.RegisterStat(
                 new Stat(
@@ -621,7 +632,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     "Packets reused",
                     "Number of packets reused out of all requests to the packet pool",
                     "clientstack",
-                    m_scene.Name,
+                    Scene.Name,
                     StatType.Pull,
                     stat => 
                         { PercentageStat pstat = (PercentageStat)stat; 
@@ -635,7 +646,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     "Packet data blocks reused",
                     "Number of data blocks reused out of all requests to the packet pool",
                     "clientstack",
-                    m_scene.Name,
+                    Scene.Name,
                     StatType.Pull,
                     stat =>
                         { PercentageStat pstat = (PercentageStat)stat; 
@@ -650,7 +661,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     "The number of objects currently stored within the packet pool",
                     "",
                     "clientstack",
-                    m_scene.Name,
+                    Scene.Name,
                     StatType.Pull,
                     stat => stat.Value = PacketPool.Instance.PacketsPooled,
                     StatVerbosity.Debug));
@@ -662,7 +673,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     "The number of objects currently stored within the packet data block pool",
                     "",
                     "clientstack",
-                    m_scene.Name,
+                    Scene.Name,
                     StatType.Pull,
                     stat => stat.Value = PacketPool.Instance.BlocksPooled,
                     StatVerbosity.Debug));
@@ -674,7 +685,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             MainConsole.Instance.Commands.AddCommand(
                 "Debug", false, "debug lludp packet",
-                 "debug lludp packet [--default] <level> [<avatar-first-name> <avatar-last-name>]",
+                 "debug lludp packet [--default | --all] <level> [<avatar-first-name> <avatar-last-name>]",
                  "Turn on packet debugging",
                    "If level >  255 then all incoming and outgoing packets are logged.\n"
                  + "If level <= 255 then incoming AgentUpdate and outgoing SimStats and SimulatorViewerTimeMessage packets are not logged.\n"
@@ -683,10 +694,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                  + "If level <=  50 then outgoing ImprovedTerseObjectUpdate packets are not logged.\n"
                  + "If level <= 0 then no packets are logged.\n"
                  + "If --default is specified then the level becomes the default logging level for all subsequent agents.\n"
-                 + "In this case, you cannot also specify an avatar name.\n"
+                 + "If --all is specified then the level becomes the default logging level for all current and subsequent agents.\n"
+                 + "In these cases, you cannot also specify an avatar name.\n"
                  + "If an avatar name is given then only packets from that avatar are logged.",
                  HandlePacketCommand);
 
+            MainConsole.Instance.Commands.AddCommand(
+                "Debug", false, "debug lludp drop",
+                "debug lludp drop <in|out> <add|remove> <packet-name>",
+                "Drop all in or outbound packets that match the given name",
+                "For test purposes.",
+                HandleDropCommand);
+
             MainConsole.Instance.Commands.AddCommand(
                 "Debug",
                 false,
@@ -738,24 +757,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private void HandlePacketCommand(string module, string[] args)
         {
-            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_scene)
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != Scene)
                 return;
 
             bool setAsDefaultLevel = false;
-            OptionSet optionSet = new OptionSet().Add("default", o => setAsDefaultLevel = o != null);
+            bool setAll = false;
+            OptionSet optionSet = new OptionSet()
+                .Add("default", o => setAsDefaultLevel = (o != null))
+                .Add("all", o => setAll = (o != null));
             List<string> filteredArgs = optionSet.Parse(args);
 
             string name = null;
 
             if (filteredArgs.Count == 6)
             {
-                if (!setAsDefaultLevel)
+                if (!(setAsDefaultLevel || setAll))
                 {
                     name = string.Format("{0} {1}", filteredArgs[4], filteredArgs[5]);
                 }
                 else
                 {
-                    MainConsole.Instance.OutputFormat("ERROR: Cannot specify a user name when setting default logging level");
+                    MainConsole.Instance.OutputFormat("ERROR: Cannot specify a user name when setting default/all logging level");
                     return;
                 }
             }
@@ -765,21 +787,35 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 int newDebug;
                 if (int.TryParse(filteredArgs[3], out newDebug))
                 {
-                    if (setAsDefaultLevel)
+                    if (setAsDefaultLevel || setAll)
                     {
                         DefaultClientPacketDebugLevel = newDebug;
+
                         MainConsole.Instance.OutputFormat(
-                            "Debug packet debug for new clients set to {0} in {1}", DefaultClientPacketDebugLevel, m_scene.Name);
+                            "Packet debug for {0} clients set to {1} in {2}",
+                            (setAll ? "all" : "future"), DefaultClientPacketDebugLevel, Scene.Name);
+
+                        if (setAll)
+                        {
+                            Scene.ForEachScenePresence(sp =>
+                            {
+                                MainConsole.Instance.OutputFormat(
+                                    "Packet debug for {0} ({1}) set to {2} in {3}",
+                                    sp.Name, sp.IsChildAgent ? "child" : "root", newDebug, Scene.Name);
+
+                                sp.ControllingClient.DebugPacketLevel = newDebug;
+                            });
+                        }
                     }
                     else
                     {
-                        m_scene.ForEachScenePresence(sp =>
+                        Scene.ForEachScenePresence(sp =>
                         {
                             if (name == null || sp.Name == name)
                             {
                                 MainConsole.Instance.OutputFormat(
                                     "Packet debug for {0} ({1}) set to {2} in {3}",
-                                    sp.Name, sp.IsChildAgent ? "child" : "root", newDebug, m_scene.Name);
+                                    sp.Name, sp.IsChildAgent ? "child" : "root", newDebug, Scene.Name);
 
                                 sp.ControllingClient.DebugPacketLevel = newDebug;
                             }
@@ -788,14 +824,65 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 }
                 else
                 {
-                    MainConsole.Instance.Output("Usage: debug lludp packet [--default] 0..255 [<first-name> <last-name>]");
+                    MainConsole.Instance.Output("Usage: debug lludp packet [--default | --all] 0..255 [<first-name> <last-name>]");
                 }
             }
         }
 
+        private void HandleDropCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != Scene)
+                return;
+
+            if (args.Length != 6)
+            {
+                MainConsole.Instance.Output("Usage: debug lludp drop <in|out> <add|remove> <packet-name>");
+                return;
+            }
+
+            string direction = args[3];
+            string subCommand = args[4];
+            string packetName = args[5];           
+
+            if (subCommand == "add")
+            {
+                MainConsole.Instance.OutputFormat(
+                    "Adding packet {0} to {1} drop list for all connections in {2}", direction, packetName, Scene.Name);
+
+                Scene.ForEachScenePresence(
+                    sp =>
+                    {
+                        LLClientView llcv = (LLClientView)sp.ControllingClient;
+
+                        if (direction == "in")
+                            llcv.AddInPacketToDropSet(packetName);
+                        else if (direction == "out")
+                            llcv.AddOutPacketToDropSet(packetName);
+                    }
+                );
+            }
+            else if (subCommand == "remove")
+            {
+                MainConsole.Instance.OutputFormat(
+                    "Removing packet {0} from {1} drop list for all connections in {2}", direction, packetName, Scene.Name);
+
+                Scene.ForEachScenePresence(
+                    sp =>
+                    {
+                        LLClientView llcv = (LLClientView)sp.ControllingClient;
+
+                        if (direction == "in")
+                            llcv.RemoveInPacketFromDropSet(packetName);
+                        else if (direction == "out")
+                            llcv.RemoveOutPacketFromDropSet(packetName);
+                    }
+                );
+            }
+        }
+
         private void HandleStartCommand(string module, string[] args)
         {
-            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_scene)
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != Scene)
                 return;
 
             if (args.Length != 4)
@@ -815,7 +902,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private void HandleStopCommand(string module, string[] args)
         {
-            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_scene)
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != Scene)
                 return;
 
             if (args.Length != 4)
@@ -835,7 +922,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private void HandlePoolCommand(string module, string[] args)
         {
-            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_scene)
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != Scene)
                 return;
 
             if (args.Length != 4)
@@ -851,7 +938,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if (EnablePools())
                 {
                     EnablePoolStats();
-                    MainConsole.Instance.OutputFormat("Packet pools enabled on {0}", m_scene.Name);
+                    MainConsole.Instance.OutputFormat("Packet pools enabled on {0}", Scene.Name);
                 }
             }
             else if (enabled == "off")
@@ -859,7 +946,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if (DisablePools())
                 {
                     DisablePoolStats();
-                    MainConsole.Instance.OutputFormat("Packet pools disabled on {0}", m_scene.Name);
+                    MainConsole.Instance.OutputFormat("Packet pools disabled on {0}", Scene.Name);
                 }
             }
             else
@@ -872,27 +959,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private void HandleAgentUpdateCommand(string module, string[] args)
         {
-            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_scene)
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != Scene)
                 return;
 
             m_discardAgentUpdates = !m_discardAgentUpdates;
 
             MainConsole.Instance.OutputFormat(
-                "Discard AgentUpdates now {0} for {1}", m_discardAgentUpdates, m_scene.Name);
+                "Discard AgentUpdates now {0} for {1}", m_discardAgentUpdates, Scene.Name);
         }
 
         private void HandleStatusCommand(string module, string[] args)
         {
-            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_scene)
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != Scene)
                 return;
 
             MainConsole.Instance.OutputFormat(
-                "IN  LLUDP packet processing for {0} is {1}", m_scene.Name, IsRunningInbound ? "enabled" : "disabled");
+                "IN  LLUDP packet processing for {0} is {1}", Scene.Name, IsRunningInbound ? "enabled" : "disabled");
 
             MainConsole.Instance.OutputFormat(
-                "OUT LLUDP packet processing for {0} is {1}", m_scene.Name, IsRunningOutbound ? "enabled" : "disabled");
+                "OUT LLUDP packet processing for {0} is {1}", Scene.Name, IsRunningOutbound ? "enabled" : "disabled");
 
-            MainConsole.Instance.OutputFormat("LLUDP pools in {0} are {1}", m_scene.Name, UsePools ? "on" : "off");
+            MainConsole.Instance.OutputFormat("LLUDP pools in {0} are {1}", Scene.Name, UsePools ? "on" : "off");
 
             MainConsole.Instance.OutputFormat(
                 "Packet debug level for new clients is {0}", DefaultClientPacketDebugLevel);
@@ -973,7 +1060,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 for (int i = 0; i < packetCount; i++)
                 {
                     byte[] data = datas[i];
-
                     if (!SendPacketData(udpClient, data, packet.Type, category, method))
                         packetQueued = true;
                 }
@@ -981,7 +1067,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             else
             {
                 byte[] data = packet.ToBytes();
-                packetQueued = SendPacketData(udpClient, data, packet.Type, category, method);
+                if (!SendPacketData(udpClient, data, packet.Type, category, method))
+                    packetQueued = true;
             }
 
             PacketPool.Instance.ReturnPacket(packet);
@@ -1059,14 +1146,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             #region Queue or Send
 
             OutgoingPacket outgoingPacket = new OutgoingPacket(udpClient, buffer, category, null);
+
             // If we were not provided a method for handling unacked, use the UDPServer default method
+            if ((outgoingPacket.Buffer.Data[0] & Helpers.MSG_RELIABLE) != 0)
                 outgoingPacket.UnackedMethod = ((method == null) ? delegate(OutgoingPacket oPacket) { ResendUnacked(oPacket); } : method);
 
             // If a Linden Lab 1.23.5 client receives an update packet after a kill packet for an object, it will 
             // continue to display the deleted object until relog.  Therefore, we need to always queue a kill object
             // packet so that it isn't sent before a queued update packet.
-            bool requestQueue = type == PacketType.KillObject;
+            bool forceQueue = (type == PacketType.KillObject);
-            if (!outgoingPacket.Client.EnqueueOutgoing(outgoingPacket, requestQueue))
+
+            if (!outgoingPacket.Client.EnqueueOutgoing(outgoingPacket, forceQueue))
             {
                 SendPacketFinal(outgoingPacket);
                 return true;
@@ -1399,7 +1489,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             // Determine which agent this packet came from
             IClientAPI client;
-            if (!m_scene.TryGetClient(endPoint, out client) || !(client is LLClientView))
+            if (!Scene.TryGetClient(endPoint, out client) || !(client is LLClientView))
             {
                 //m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName);
 
@@ -1694,7 +1784,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 m_log.DebugFormat(
                     "[LLUDPSERVER]: Handling UseCircuitCode request for circuit {0} to {1} from IP {2}",
-                    uccp.CircuitCode.Code, m_scene.RegionInfo.RegionName, endPoint);
+                    uccp.CircuitCode.Code, Scene.RegionInfo.RegionName, endPoint);
     
                 AuthenticateResponse sessionInfo;
                 if (IsClientAuthorized(uccp, out sessionInfo))
@@ -1716,11 +1806,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     // We only want to send initial data to new clients, not ones which are being converted from child to root.
                     if (client != null)
                     {
-                        AgentCircuitData aCircuit = m_scene.AuthenticateHandler.GetAgentCircuitData(uccp.CircuitCode.Code);
+                        AgentCircuitData aCircuit = Scene.AuthenticateHandler.GetAgentCircuitData(uccp.CircuitCode.Code);
                         bool tp = (aCircuit.teleportFlags > 0);
                         // Let's delay this for TP agents, otherwise the viewer doesn't know where to get resources from
-                        if (!tp)
+                        if (!tp && !client.SceneAgent.SentInitialDataToClient)
-                            client.SceneAgent.SendInitialDataToMe();
+                            client.SceneAgent.SendInitialDataToClient();
                     }
                 }
                 else
@@ -1728,7 +1818,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     // Don't create clients for unauthorized requesters.
                     m_log.WarnFormat(
                         "[LLUDPSERVER]: Ignoring connection request for {0} to {1} with unknown circuit code {2} from IP {3}",
-                        uccp.CircuitCode.ID, m_scene.RegionInfo.RegionName, uccp.CircuitCode.Code, endPoint);
+                        uccp.CircuitCode.ID, Scene.RegionInfo.RegionName, uccp.CircuitCode.Code, endPoint);
                 }
     
                 //            m_log.DebugFormat(
@@ -1760,7 +1850,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 CompleteAgentMovementPacket packet = (CompleteAgentMovementPacket)array[1];
 
                 m_log.DebugFormat(
-                    "[LLUDPSERVER]: Handling CompleteAgentMovement request from {0} in {1}", endPoint, m_scene.Name);
+                    "[LLUDPSERVER]: Handling CompleteAgentMovement request from {0} in {1}", endPoint, Scene.Name);
 
                 // Determine which agent this packet came from
                 // We need to wait here because in when using the OpenSimulator V2 teleport protocol to travel to a destination
@@ -1771,7 +1861,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 int count = 40;
                 while (count-- > 0)
                 {
-                    if (m_scene.TryGetClient(endPoint, out client))
+                    if (Scene.TryGetClient(endPoint, out client))
                     {
                         if (!client.IsActive)
                         {
@@ -1780,7 +1870,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             // not yet been established).
                             m_log.DebugFormat(
                                 "[LLUDPSERVER]: Received a CompleteAgentMovement from {0} for {1} in {2} but client is not active yet.  Waiting.",
-                                endPoint, client.Name, m_scene.Name);
+                                endPoint, client.Name, Scene.Name);
                         }
                         else if (client.SceneAgent == null)
                         {
@@ -1792,7 +1882,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             // the client manager
                             m_log.DebugFormat(
                                 "[LLUDPSERVER]: Received a CompleteAgentMovement from {0} for {1} in {2} but client SceneAgent not set yet.  Waiting.",
-                                endPoint, client.Name, m_scene.Name);
+                                endPoint, client.Name, Scene.Name);
                         }
                         else
                         {
@@ -1803,7 +1893,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     {
                         m_log.DebugFormat(
                             "[LLUDPSERVER]: Received a CompleteAgentMovement from {0} in {1} but no client exists yet.  Waiting.", 
-                            endPoint, m_scene.Name);
+                            endPoint, Scene.Name);
                     }
 
                     Thread.Sleep(200);
@@ -1813,7 +1903,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 {
                     m_log.DebugFormat(
                         "[LLUDPSERVER]: No client found for CompleteAgentMovement from {0} in {1} after wait.  Dropping.",
-                        endPoint, m_scene.Name);
+                        endPoint, Scene.Name);
 
                     return;
                 }
@@ -1825,7 +1915,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     // purposes.
                     m_log.DebugFormat(
                         "[LLUDPSERVER]: Received a CompleteAgentMovement from {0} for {1} in {2} but client is not active after wait.  Dropping.",
-                        endPoint, client.Name, m_scene.Name);
+                        endPoint, client.Name, Scene.Name);
 
                     return;
                 }
@@ -1920,11 +2010,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // consistently, this lock could probably be removed.
             lock (this)
             {
-                if (!m_scene.TryGetClient(agentID, out client))
+                if (!Scene.TryGetClient(agentID, out client))
                 {
                     LLUDPClient udpClient = new LLUDPClient(this, ThrottleRates, m_throttle, circuitCode, agentID, remoteEndPoint, m_defaultRTO, m_maxRTO);
     
-                    client = new LLClientView(m_scene, this, udpClient, sessionInfo, agentID, sessionID, circuitCode);
+                    client = new LLClientView(Scene, this, udpClient, sessionInfo, agentID, sessionID, circuitCode);
                     client.OnLogout += LogoutHandler;
                     client.DebugPacketLevel = DefaultClientPacketDebugLevel;
     
@@ -1954,13 +2044,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 m_log.WarnFormat(
                     "[LLUDPSERVER]: No packets received from {0} agent of {1} for {2}ms in {3}.  Disconnecting.",
-                    client.SceneAgent.IsChildAgent ? "child" : "root", client.Name, timeoutTicks, m_scene.Name);
+                    client.SceneAgent.IsChildAgent ? "child" : "root", client.Name, timeoutTicks, Scene.Name);
     
                 if (!client.SceneAgent.IsChildAgent)
                      client.Kick("Simulator logged you out due to connection timeout.");
             }
 
-            m_scene.CloseAgent(client.AgentId, true);
+            Scene.CloseAgent(client.AgentId, true);
         }
 
         private void IncomingPacketHandler()
@@ -2072,7 +2162,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                     // Handle outgoing packets, resends, acknowledgements, and pings for each
                     // client. m_packetSent will be set to true if a packet is sent
-                    m_scene.ForEachClient(clientPacketHandler);
+                    Scene.ForEachClient(clientPacketHandler);
 
                     m_currentOutgoingClient = null;
 
@@ -2239,7 +2329,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             watch1.Reset();
 
             // reuse this -- it's every ~100ms
-            if (m_scene.EmergencyMonitoring && nticks % 100 == 0)
+            if (Scene.EmergencyMonitoring && nticks % 100 == 0)
             {
                 m_log.InfoFormat("[LLUDPSERVER]: avg processing ticks: {0} avg unacked: {1} avg acks: {2} avg ping: {3} avg dequeue: {4} (TickCountRes: {5} sent: {6} notsent: {7})", 
                     avgProcessingTicks, avgResendUnackedTicks, avgSendAcksTicks, avgSendPingTicks, avgDequeueTicks, TickCountResolution, npacksSent, npackNotSent);
@@ -2288,7 +2378,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 m_log.DebugFormat(
                     "[LLUDPSERVER]: Dropped incoming {0} for dead client {1} in {2}",
-                    packet.Type, client.Name, m_scene.RegionInfo.RegionName);
+                    packet.Type, client.Name, Scene.RegionInfo.RegionName);
             }
 
             IncomingPacketsProcessed++;
@@ -2301,7 +2391,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (!client.IsLoggingOut)
             {
                 client.IsLoggingOut = true;
-                m_scene.CloseAgent(client.AgentId, false);
+                Scene.CloseAgent(client.AgentId, false);
             }
         }
     }

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

@@ -0,0 +1,286 @@
+/*
+ * 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.Concurrent;
+using System.Reflection;
+using System.Threading;
+using log4net;
+using OpenSim.Framework;
+using OpenSim.Framework.Monitoring;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.ClientStack.LindenUDP
+{
+    public struct RefillRequest
+    {
+        public LLUDPClient Client;
+        public ThrottleOutPacketTypeFlags Categories;
+
+        public RefillRequest(LLUDPClient client, ThrottleOutPacketTypeFlags categories)
+        {
+            Client = client;
+            Categories = categories;
+        }
+    }
+
+    public class OutgoingQueueRefillEngine
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public bool IsRunning { get; private set; } 
+
+        /// <summary>
+        /// The timeout in milliseconds to wait for at least one event to be written when the recorder is stopping.
+        /// </summary>
+        public int RequestProcessTimeoutOnStop { get; set; }
+
+        /// <summary>
+        /// Controls whether we need to warn in the log about exceeding the max queue size.
+        /// </summary>
+        /// <remarks>
+        /// This is flipped to false once queue max has been exceeded and back to true when it falls below max, in 
+        /// order to avoid spamming the log with lots of warnings.
+        /// </remarks>
+        private bool m_warnOverMaxQueue = true;
+
+        private BlockingCollection<RefillRequest> m_requestQueue;
+
+        private CancellationTokenSource m_cancelSource = new CancellationTokenSource();
+
+        private LLUDPServer m_udpServer;
+
+        private Stat m_oqreRequestsWaitingStat;
+
+        /// <summary>
+        /// Used to signal that we are ready to complete stop.
+        /// </summary>
+        private ManualResetEvent m_finishedProcessingAfterStop = new ManualResetEvent(false);
+
+        public OutgoingQueueRefillEngine(LLUDPServer server)
+        {
+            RequestProcessTimeoutOnStop = 5000;
+            m_udpServer = server;
+
+            MainConsole.Instance.Commands.AddCommand(
+                "Debug",
+                false,
+                "debug lludp oqre",
+                "debug lludp oqre <start|stop|status>",
+                "Start, stop or get status of OutgoingQueueRefillEngine.",
+                "If stopped then refill requests are processed directly via the threadpool.",
+                HandleOqreCommand);
+        }
+
+        public void Start()
+        {
+            lock (this)
+            {
+                if (IsRunning)
+                    return;
+
+                IsRunning = true;
+
+                m_finishedProcessingAfterStop.Reset();
+
+                m_requestQueue = new BlockingCollection<RefillRequest>(new ConcurrentQueue<RefillRequest>(), 5000);
+
+                m_oqreRequestsWaitingStat = 
+                    new Stat(
+                        "OQRERequestsWaiting",
+                        "Number of outgong queue refill requests waiting for processing.",
+                        "",
+                        "",
+                        "clientstack",
+                        m_udpServer.Scene.Name,
+                        StatType.Pull,
+                        MeasuresOfInterest.None,
+                        stat => stat.Value = m_requestQueue.Count,
+                        StatVerbosity.Debug);
+
+                StatsManager.RegisterStat(m_oqreRequestsWaitingStat);
+
+                Watchdog.StartThread(
+                    ProcessRequests,
+                    String.Format("OutgoingQueueRefillEngineThread ({0})", m_udpServer.Scene.Name),
+                    ThreadPriority.Normal,
+                    false,
+                    true,
+                    null,
+                    int.MaxValue);
+            }
+        }
+
+        public void Stop()
+        {   
+            lock (this)
+            {
+                try
+                {
+                    if (!IsRunning)
+                        return;
+
+                    IsRunning = false;
+
+                    int requestsLeft = m_requestQueue.Count;
+
+                    if (requestsLeft <= 0)
+                    {
+                        m_cancelSource.Cancel();
+                    }
+                    else 
+                    {
+                        m_log.InfoFormat("[OUTGOING QUEUE REFILL ENGINE]: Waiting to write {0} events after stop.", requestsLeft);
+
+                        while (requestsLeft > 0)
+                        {
+                            if (!m_finishedProcessingAfterStop.WaitOne(RequestProcessTimeoutOnStop))
+                            {
+                                // After timeout no events have been written
+                                if (requestsLeft == m_requestQueue.Count)
+                                {
+                                    m_log.WarnFormat(
+                                        "[OUTGOING QUEUE REFILL ENGINE]: No requests processed after {0} ms wait.  Discarding remaining {1} requests", 
+                                        RequestProcessTimeoutOnStop, requestsLeft);
+
+                                    break;
+                                }
+                            }
+
+                            requestsLeft = m_requestQueue.Count;
+                        }
+                    }
+                }
+                finally
+                {
+                    m_cancelSource.Dispose();
+                    StatsManager.DeregisterStat(m_oqreRequestsWaitingStat);
+                    m_oqreRequestsWaitingStat = null;
+                    m_requestQueue = null;
+                }
+            }
+        }
+
+        public bool QueueRequest(LLUDPClient client, ThrottleOutPacketTypeFlags categories)
+        {
+            if (m_requestQueue.Count < m_requestQueue.BoundedCapacity)
+            {
+//                m_log.DebugFormat(
+//                    "[OUTGOING QUEUE REFILL ENGINE]: Adding request for categories {0} for {1} in {2}", 
+//                    categories, client.AgentID, m_udpServer.Scene.Name);
+
+                m_requestQueue.Add(new RefillRequest(client, categories));
+
+                if (!m_warnOverMaxQueue)
+                    m_warnOverMaxQueue = true;
+
+                return true;
+            }
+            else
+            {
+                if (m_warnOverMaxQueue)
+                {
+                    m_log.WarnFormat(
+                        "[OUTGOING QUEUE REFILL ENGINE]: Request queue at maximum capacity, not recording request from {0} in {1}", 
+                        client.AgentID, m_udpServer.Scene.Name);
+
+                    m_warnOverMaxQueue = false;
+                }
+
+                return false;
+            }
+        }
+
+        private void ProcessRequests()
+        {
+            try
+            {
+                while (IsRunning || m_requestQueue.Count > 0)
+                {
+                    RefillRequest req = m_requestQueue.Take(m_cancelSource.Token);
+
+    //                QueueEmpty callback = req.Client.OnQueueEmpty;                      
+    //
+    //                if (callback != null)
+    //                {               
+    //                    try 
+    //                    { 
+    //                        callback(req.Categories); 
+    //                    }
+    //                    catch (Exception e) 
+    //                    { 
+    //                        m_log.Error("[OUTGOING QUEUE REFILL ENGINE]: ProcessRequests(" + req.Categories + ") threw an exception: " + e.Message, e); 
+    //                    }
+    //                }
+
+                    req.Client.FireQueueEmpty(req.Categories);
+                }
+            }
+            catch (OperationCanceledException)
+            {
+            }
+
+            m_finishedProcessingAfterStop.Set();
+        }
+
+        private void HandleOqreCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
+                return;
+
+            if (args.Length != 4)
+            {
+                MainConsole.Instance.Output("Usage: debug lludp oqre <stop|start|status>");
+                return;
+            }
+
+            string subCommand = args[3];
+
+            if (subCommand == "stop")
+            {
+                Stop();
+                MainConsole.Instance.OutputFormat("Stopped OQRE for {0}", m_udpServer.Scene.Name);
+            }
+            else if (subCommand == "start")
+            {
+                Start();
+                MainConsole.Instance.OutputFormat("Started OQRE for {0}", m_udpServer.Scene.Name);
+            }
+            else if (subCommand == "status")
+            {
+                MainConsole.Instance.OutputFormat("OQRE in {0}", m_udpServer.Scene.Name);
+                MainConsole.Instance.OutputFormat("Running: {0}", IsRunning);
+                MainConsole.Instance.OutputFormat(
+                    "Requests waiting: {0}", IsRunning ? m_requestQueue.Count.ToString() : "n/a");
+            }
+            else 
+            {
+                MainConsole.Instance.OutputFormat("Unrecognized OQRE subcommand {0}", subCommand);
+            }
+        }
+    }
+}

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

@@ -233,7 +233,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 //            testLLUDPServer.RemoveClientCircuit(myCircuitCode);
 //            Assert.IsFalse(testLLUDPServer.HasCircuit(myCircuitCode));
 //            
-//            // Check that removing a non-existant circuit doesn't have any bad effects
+//            // Check that removing a non-existent circuit doesn't have any bad effects
 //            testLLUDPServer.RemoveClientCircuit(101);
 //            Assert.IsFalse(testLLUDPServer.HasCircuit(101));
 //        }

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

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -335,13 +335,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         // greater than this.
         // </summary>
         protected Int64 m_maxDripRate = 0;
-        protected Int64 MaxDripRate
+        public Int64 MaxDripRate
         {
             get { return (m_maxDripRate == 0 ? m_totalDripRequest : m_maxDripRate); }
-            set { m_maxDripRate = (value == 0 ? 0 : Math.Max(value,m_minimumFlow)); }
+            protected set { m_maxDripRate = (value == 0 ? 0 : Math.Max(value,m_minimumFlow)); }
         }
 
-        private bool m_enabled = false;
+        public bool Enabled { get; private set; }
         
         // <summary>
         // 
@@ -362,9 +362,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         // </summary>
         public AdaptiveTokenBucket(TokenBucket parent, Int64 maxDripRate, bool enabled) : base(parent,maxDripRate)
         {
-            m_enabled = enabled;
+            Enabled = enabled;
 
-            if (m_enabled)
+            if (Enabled)
             {
                 // m_log.DebugFormat("[TOKENBUCKET] Adaptive throttle enabled");
                 MaxDripRate = maxDripRate;
@@ -378,7 +378,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public void ExpirePackets(Int32 count)
         {
             // m_log.WarnFormat("[ADAPTIVEBUCKET] drop {0} by {1} expired packets",AdjustedDripRate,count);
-            if (m_enabled)
+            if (Enabled)
                 AdjustedDripRate = (Int64) (AdjustedDripRate / Math.Pow(2,count));
         }
 
@@ -387,7 +387,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         // </summary>
         public void AcknowledgePackets(Int32 count)
         {
-            if (m_enabled)
+            if (Enabled)
                 AdjustedDripRate = AdjustedDripRate + count;
         }
     }

OpenSim/Region/ClientStack/RegionApplicationBase.cs

@@ -39,6 +39,7 @@ using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
+using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.ClientStack
 {

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

@@ -31,6 +31,7 @@ using System.Reflection;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 using PermissionMask = OpenSim.Framework.PermissionMask;
@@ -376,6 +377,8 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
             m_Scene.AssetService.Store(m_asset);
 
             m_transactions.RemoveXferUploader(m_transactionID);
+
+            m_Scene.EventManager.TriggerOnNewInventoryItemUploadComplete(ourClient.AgentId, (AssetType)type, m_asset.FullID, m_asset.Name, 0);
         }
 
         /// <summary>
@@ -422,5 +425,6 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 
             m_transactions.RemoveXferUploader(m_transactionID);
         }
+
     }
 }

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

@@ -231,7 +231,11 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
                 {
                     try
                     {
-                        List<int> layerStarts = CSJ2K.J2kImage.GetLayerBoundaries(new MemoryStream(j2kData));
+                        List<int> layerStarts;
+                        using (MemoryStream ms = new MemoryStream(j2kData))
+                        {
+                            layerStarts = CSJ2K.J2kImage.GetLayerBoundaries(ms);
+                        }
 
                         if (layerStarts != null && layerStarts.Count > 0)
                         {

OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs

@@ -315,11 +315,14 @@ namespace OpenSim.Region.CoreModules.Asset
         /// Close region module.
         /// </summary>
         public void Close()
+        {
+            if (m_enabled)
             {
                 m_enabled = false;
                 m_cache.Clear();
                 m_cache = null;
             }
+        }
 
         /// <summary>
         /// Initialize region module.

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

@@ -251,7 +251,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         private void SendAppearance(ScenePresence sp)
         {
             // Send the appearance to everyone in the scene
-            sp.SendAppearanceToAllOtherAgents();
+            sp.SendAppearanceToAllOtherClients();
 
             // Send animations back to the avatar as well
             sp.Animator.SendAnimPack();

OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs

@@ -135,7 +135,7 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures
 
                     sr.ReadEndElement();
                 }
-                m_log.DebugFormat("[XBakes]: Ended reading");
+                m_log.DebugFormat("[XBakes]: read {0} textures for user {1}", ret.Count, id);
                 sr.Close();
                 s.Close();
 
@@ -186,6 +186,7 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures
                 delegate
                 {
                     rc.Request(reqStream, m_Auth);
+                    m_log.DebugFormat("[XBakes]: stored {0} textures for user {1}", data.Length, agentId);
                 }
             );
         }

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

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -289,18 +289,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
             rootElement.AppendChild(result);
 
-            return DocToBytes(doc);
+            return Util.DocToBytes(doc);
-        }
-
-        private byte[] DocToBytes(XmlDocument doc)
-        {
-            MemoryStream ms = new MemoryStream();
-            XmlTextWriter xw = new XmlTextWriter(ms, null);
-            xw.Formatting = Formatting.Indented;
-            doc.WriteTo(xw);
-            xw.Flush();
-
-            return ms.ToArray();
         }
 
         #endregion

OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs

@@ -1153,16 +1153,24 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
             
             parameters = (OSDMap)Params;
 
+            if (parameters.ContainsKey("result"))
+            {
                 OSDArray list = (OSDArray)parameters["result"];
 
-            foreach(OSD asset in list)
+                foreach (OSD asset in list)
                 {
                     OSDString assetId = (OSDString)asset;
 
-                Scene.AssetService.Get(string.Format("{0}/{1}",assetServerURI, assetId.AsString()));
+                    Scene.AssetService.Get(string.Format("{0}/{1}", assetServerURI, assetId.AsString()));
                 }
                 return true;
             }
+            else
+            {
+                m_log.ErrorFormat("[PROFILES]: Problematic response for image_assets_request from {0}", profileServerURI);
+                return false;
+            }
+        }
 
         /// <summary>
         /// Gets the user account data.

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

@@ -208,7 +208,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         protected virtual void InitialiseCommon(IConfigSource source)
         {
             string transferVersionName = "SIMULATION";
-            float maxTransferVersion = 0.2f;
+            float maxTransferVersion = 0.3f;
 
             IConfig hypergridConfig = source.Configs["Hypergrid"];
             if (hypergridConfig != null)
@@ -760,8 +760,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             string reason;
             string version;
+            string myversion = string.Format("{0}/{1}", OutgoingTransferVersionName, MaxOutgoingTransferVersion);
             if (!Scene.SimulationService.QueryAccess(
-                finalDestination, sp.ControllingClient.AgentId, homeURI, true, position, out version, out reason))
+                finalDestination, sp.ControllingClient.AgentId, homeURI, true, position, myversion, out version, out reason))
             {
                 sp.ControllingClient.SendTeleportFailed(reason);
 
@@ -820,7 +821,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 agentCircuit.Id0 = currentAgentCircuit.Id0;
             }
 
-            if (NeedsNewAgent(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY))
+            // if (NeedsNewAgent(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY))
+            float dist = (float)Math.Max(sp.Scene.DefaultDrawDistance,
+                (float)Math.Max(sp.Scene.RegionInfo.RegionSizeX, sp.Scene.RegionInfo.RegionSizeY));
+            if (NeedsNewAgent(dist, oldRegionX, newRegionX, oldRegionY, newRegionY))
             {
                 // brand new agent, let's create a new caps seed
                 agentCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath();
@@ -833,7 +837,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             if (versionComponents.Length >= 2)
                 float.TryParse(versionComponents[1], out versionNumber);
 
-            if (versionNumber == 0.2f && MaxOutgoingTransferVersion >= versionNumber)
+            if (versionNumber >= 0.2f && MaxOutgoingTransferVersion >= versionNumber)
                 TransferAgent_V2(sp, agentCircuit, reg, finalDestination, endPoint, teleportFlags, oldRegionX, newRegionX, oldRegionY, newRegionY, version, out reason);
             else
                 TransferAgent_V1(sp, agentCircuit, reg, finalDestination, endPoint, teleportFlags, oldRegionX, newRegionX, oldRegionY, newRegionY, version, out reason);           
@@ -894,7 +898,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             IClientIPEndpoint ipepClient;
             string capsPath = String.Empty;
-            if (NeedsNewAgent(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY))
+            float dist = (float)Math.Max(sp.Scene.DefaultDrawDistance,
+                (float)Math.Max(sp.Scene.RegionInfo.RegionSizeX, sp.Scene.RegionInfo.RegionSizeY));
+            if (NeedsNewAgent(dist, oldRegionX, newRegionX, oldRegionY, newRegionY))
             {
                 m_log.DebugFormat(
                     "[ENTITY TRANSFER MODULE]: Determined that region {0} at {1},{2} needs new child agent for incoming agent {3} from {4}",
@@ -1140,7 +1146,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             IClientIPEndpoint ipepClient;
             string capsPath = String.Empty;
-            if (NeedsNewAgent(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY))
+            float dist = (float)Math.Max(sp.Scene.DefaultDrawDistance, 
+                (float)Math.Max(sp.Scene.RegionInfo.RegionSizeX, sp.Scene.RegionInfo.RegionSizeY));
+            if (NeedsNewAgent(dist, oldRegionX, newRegionX, oldRegionY, newRegionY))
             {
                 m_log.DebugFormat(
                     "[ENTITY TRANSFER MODULE]: Determined that region {0} at {1},{2} needs new child agent for agent {3} from {4}",
@@ -1509,8 +1517,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 }
 
                 // Check to see if we have access to the target region.
+                string myversion = string.Format("{0}/{1}", OutgoingTransferVersionName, MaxOutgoingTransferVersion);
                 if (neighbourRegion != null
-                    && !scene.SimulationService.QueryAccess(neighbourRegion, agentID, homeURI, false, newpos, out version, out failureReason))
+                    && !scene.SimulationService.QueryAccess(neighbourRegion, agentID, homeURI, false, newpos, myversion, out version, out failureReason))
                 {
                     // remember banned
                     m_bannedRegionCache.Add(neighbourRegion.RegionHandle, agentID);
@@ -1520,7 +1529,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             else
             {
                 // The destination region just doesn't exist
-                failureReason = "Cannot cross into non-existant region";
+                failureReason = "Cannot cross into non-existent region";
             }
 
             if (neighbourRegion == null)
@@ -1777,8 +1786,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
 
             // now we have a child agent in this region. Request all interesting data about other (root) agents
-            agent.SendOtherAgentsAvatarDataToMe();
+            agent.SendOtherAgentsAvatarDataToClient();
-            agent.SendOtherAgentsAppearanceToMe();
+            agent.SendOtherAgentsAppearanceToClient();
 
             // Backwards compatibility. Best effort
             if (version == "Unknown" || version == string.Empty)
@@ -1864,7 +1873,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             //foreach (ulong h in agent.ChildrenCapSeeds.Keys)
             //    m_log.DebugFormat("[XXX] --> {0}", h);
             //m_log.DebugFormat("[XXX] Adding {0}", region.RegionHandle);
-            agent.ChildrenCapSeeds.Add(region.RegionHandle, agent.CapsPath);
+            if (agent.ChildrenCapSeeds.ContainsKey(region.RegionHandle))
+            {
+                m_log.WarnFormat(
+                    "[ENTITY TRANSFER]: Overwriting caps seed {0} with {1} for region {2} (handle {3}) for {4} in {5}", 
+                    agent.ChildrenCapSeeds[region.RegionHandle], agent.CapsPath, 
+                    region.RegionName, region.RegionHandle, sp.Name, Scene.Name);
+            }
+
+            agent.ChildrenCapSeeds[region.RegionHandle] = agent.CapsPath;
 
             if (sp.Scene.CapsModule != null)
             {

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

@@ -130,7 +130,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
             base.AddRegion(scene);
             m_assMapper = new HGAssetMapper(scene, m_HomeURI);
-            scene.EventManager.OnNewInventoryItemUploadComplete += UploadInventoryItem;
+            scene.EventManager.OnNewInventoryItemUploadComplete += PostInventoryAsset;
             scene.EventManager.OnTeleportStart += TeleportStart;
             scene.EventManager.OnTeleportFail += TeleportFail;
 
@@ -209,7 +209,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             }
         }
 
-        public void UploadInventoryItem(UUID avatarID, AssetType type, UUID assetID, string name, int userlevel)
+        public void PostInventoryAsset(UUID avatarID, AssetType type, UUID assetID, string name, int userlevel)
         {
             if (type == AssetType.Link)
                 return;
@@ -248,7 +248,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         {
             UUID newAssetID = base.CapsUpdateInventoryItemAsset(remoteClient, itemID, data);
 
-            UploadInventoryItem(remoteClient.AgentId, AssetType.Unknown, newAssetID, "", 0);
+            PostInventoryAsset(remoteClient.AgentId, AssetType.Unknown, newAssetID, "", 0);
 
             return newAssetID;
         }
@@ -260,7 +260,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         {
             if (base.UpdateInventoryItemAsset(ownerID, item, asset))
             {
-                UploadInventoryItem(ownerID, (AssetType)asset.Type, asset.FullID, asset.Name, 0);
+                PostInventoryAsset(ownerID, (AssetType)asset.Type, asset.FullID, asset.Name, 0);
                 return true;
             }
 
@@ -273,7 +273,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         protected override void ExportAsset(UUID agentID, UUID assetID)
         {
             if (!assetID.Equals(UUID.Zero))
-                UploadInventoryItem(agentID, AssetType.Unknown, assetID, "", 0);
+                PostInventoryAsset(agentID, AssetType.Unknown, assetID, "", 0);
             else
                 m_log.Debug("[HGScene]: Scene.Inventory did not create asset");
         }

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

@@ -829,7 +829,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             byte bRayEndIsIntersection = (byte)(RayEndIsIntersection ? 1 : 0);
             Vector3 pos;
 
-            bool single = m_Scene.GetObjectsToRez(rezAsset.Data, attachment, out objlist, out veclist, out bbox, out offsetHeight);
+            bool single 
+                = m_Scene.GetObjectsToRez(
+                    rezAsset.Data, attachment, out objlist, out veclist, out bbox, out offsetHeight);
 
             if (single)
             {

OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs

@@ -111,6 +111,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
             InventoryFolderBase objsFolder 
                 = InventoryArchiveUtils.FindFoldersByPath(m_scene.InventoryService, m_userId, "Objects")[0];
             item1.Folder = objsFolder.ID;
+            item1.Flags |= (uint)InventoryItemFlags.ObjectHasMultipleItems;
             m_scene.AddInventoryItem(item1);
             
             SceneObjectGroup so 

OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs

@@ -159,7 +159,7 @@ namespace OpenSim.Region.CoreModules.Framework.Library
             }
 
             RegionInfo regInfo = new RegionInfo();
-            Scene m_MockScene = new Scene(regInfo);
+            Scene m_MockScene = new Scene(regInfo, null);
             LocalInventoryService invService = new LocalInventoryService(lib);
             m_MockScene.RegisterModuleInterface<IInventoryService>(invService);
             m_MockScene.RegisterModuleInterface<IAssetService>(m_Scene.AssetService);

OpenSim/Region/CoreModules/Framework/Statistics/Logging/LogWriter.cs

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -151,7 +151,7 @@ namespace OpenSim.Region.CoreModules.Framework.Statistics.Logging
                         string path = (m_logDirectory.Length > 0 ? m_logDirectory
                                     + System.IO.Path.DirectorySeparatorChar.ToString() : "")
                                 + String.Format("{0}{1}.log", LogFileHeader, now.ToString("yyyyMMddHHmmss"));
-                        m_logFile = new StreamWriter(File.Open(path, FileMode.Append, FileAccess.Write));
+                        m_logFile = new StreamWriter(File.Open(path, FileMode.Append, FileAccess.Write, FileShare.ReadWrite));
                     }
                     if (m_logFile != null)
                     {

OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs

@@ -36,6 +36,7 @@ using Nini.Config;
 using Nwc.XmlRpc;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Framework.Monitoring;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Interfaces;
@@ -656,12 +657,8 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
 
         public void Process()
         {
-            httpThread = new Thread(SendRequest);
-            httpThread.Name = "HttpRequestThread";
-            httpThread.Priority = ThreadPriority.BelowNormal;
-            httpThread.IsBackground = true;
             _finished = false;
-            httpThread.Start();
+            Watchdog.StartThread(SendRequest, "HttpRequestThread", ThreadPriority.BelowNormal, true, false);
         }
 
         /*
@@ -733,6 +730,8 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
             }
 
             _finished = true;
+
+            Watchdog.RemoveThread();
         }
 
         public void Stop()

OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs

@@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
             r1.ExternalHostName = "127.0.0.1";
             r1.HttpPort = 9001;
             r1.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0);
-            Scene s = new Scene(new RegionInfo());
+            Scene s = new Scene(new RegionInfo(), null);
             s.RegionInfo.RegionID = r1.RegionID;
             m_LocalConnector.AddRegion(s);
             
@@ -97,7 +97,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
             r2.ExternalHostName = "127.0.0.1";
             r2.HttpPort = 9002;
             r2.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0);
-            s = new Scene(new RegionInfo());
+            s = new Scene(new RegionInfo(), null);
             s.RegionInfo.RegionID = r2.RegionID;
             m_LocalConnector.AddRegion(s);
 
@@ -109,7 +109,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
             r3.ExternalHostName = "127.0.0.1";
             r3.HttpPort = 9003;
             r3.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0);
-            s = new Scene(new RegionInfo());
+            s = new Scene(new RegionInfo(), null);
             s.RegionInfo.RegionID = r3.RegionID;
             m_LocalConnector.AddRegion(s);
 
@@ -121,7 +121,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
             r4.ExternalHostName = "127.0.0.1";
             r4.HttpPort = 9004;
             r4.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0);
-            s = new Scene(new RegionInfo());
+            s = new Scene(new RegionInfo(), null);
             s.RegionInfo.RegionID = r4.RegionID;
             m_LocalConnector.AddRegion(s);
 

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

@@ -244,7 +244,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
                             if (inventoryURL != null && inventoryURL != string.Empty)
                             {
                                 inventoryURL = inventoryURL.Trim(new char[] { '/' });
-                                m_InventoryURLs.Add(userID, inventoryURL);
+                                m_InventoryURLs[userID] = inventoryURL;
                                 m_log.DebugFormat("[HG INVENTORY CONNECTOR]: Added {0} to the cache of inventory URLs", inventoryURL);
                                 return;
                             }

OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs

@@ -52,6 +52,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
         /// Currently valid versions are "SIMULATION/0.1" and "SIMULATION/0.2"
         /// </remarks>
         public string ServiceVersion { get; set; }
+        private float m_VersionNumber = 0.3f;
 
         /// <summary>
         /// Map region ID to scene.
@@ -84,15 +85,19 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 
         public void InitialiseService(IConfigSource configSource)
         {
-            ServiceVersion = "SIMULATION/0.2";
+            ServiceVersion = "SIMULATION/0.3";
             IConfig config = configSource.Configs["SimulationService"];
             if (config != null)
             {
                 ServiceVersion = config.GetString("ConnectorProtocolVersion", ServiceVersion);
 
-                if (ServiceVersion != "SIMULATION/0.1" && ServiceVersion != "SIMULATION/0.2")
+                if (ServiceVersion != "SIMULATION/0.1" && ServiceVersion != "SIMULATION/0.2" && ServiceVersion != "SIMULATION/0.3")
                     throw new Exception(string.Format("Invalid ConnectorProtocolVersion {0}", ServiceVersion));
 
+                string[] versionComponents = ServiceVersion.Split(new char[] { '/' });
+                if (versionComponents.Length >= 2)
+                    float.TryParse(versionComponents[1], out m_VersionNumber);
+
                 m_log.InfoFormat(
                     "[LOCAL SIMULATION CONNECTOR]: Initialized with connector protocol version {0}", ServiceVersion);
             }
@@ -264,7 +269,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return true;
         }
 
-        public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, out string version, out string reason)
+        public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string theirversion, out string version, out string reason)
         {
             reason = "Communications failure";
             version = ServiceVersion;
@@ -276,6 +281,22 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 //                    m_log.DebugFormat(
 //                        "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate",
 //                        s.RegionInfo.RegionName, destination.RegionHandle);
+                uint size = m_scenes[destination.RegionID].RegionInfo.RegionSizeX;
+
+                float theirVersionNumber = 0f;
+                string[] versionComponents = theirversion.Split(new char[] { '/' });
+                if (versionComponents.Length >= 2)
+                    float.TryParse(versionComponents[1], out theirVersionNumber);
+
+                // Var regions here, and the requesting simulator is in an older version.
+                // We will forbide this, because it crashes the viewers
+                if (theirVersionNumber < 0.3f && size > 256)
+                {
+                    reason = "Destination is a variable-sized region, and source is an old simulator. Consider upgrading.";
+                    m_log.DebugFormat("[LOCAL SIMULATION CONNECTOR]: Request to access this variable-sized region from {0} simulator was denied", theirVersionNumber);
+                    return false;
+                
+                }
 
                 return m_scenes[destination.RegionID].QueryAccess(agentID, agentHomeURI, viaTeleport, position, out reason);
             }

OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs

@@ -207,7 +207,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return m_remoteConnector.UpdateAgent(destination, cAgentData);
         }
 
-        public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, out string version, out string reason)
+        public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string sversion, out string version, out string reason)
         {
             reason = "Communications failure";
             version = "Unknown";
@@ -216,12 +216,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
                 return false;
 
             // Try local first
-            if (m_localBackend.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, out version, out reason))
+            if (m_localBackend.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, sversion, out version, out reason))
                 return true;
 
             // else do the remote thing
             if (!m_localBackend.IsLocalRegion(destination.RegionID))
-                return m_remoteConnector.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, out version, out reason);
+                return m_remoteConnector.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, sversion, out version, out reason);
 
             return false;
         }

OpenSim/Region/CoreModules/World/Access/AccessModule.cs

@@ -90,13 +90,17 @@ namespace OpenSim.Region.CoreModules.World
         }
 
         public void AddRegion(Scene scene)
+        {
+            lock (m_SceneList)
             {
                 if (!m_SceneList.Contains(scene))
                     m_SceneList.Add(scene);
             }
+        }
 
         public void RemoveRegion(Scene scene)
         {
+            lock (m_SceneList)
                 m_SceneList.Remove(scene);
         }
 

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

@@ -918,7 +918,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         {
             ITerrainModule terrainModule = scene.RequestModuleInterface<ITerrainModule>();
 
-            MemoryStream ms = new MemoryStream(data);
+            using (MemoryStream ms = new MemoryStream(data))
+            {
                 if (m_displacement != Vector3.Zero || m_rotation != 0f)
                 {
                     Vector2 rotationCenter = new Vector2(m_rotationCenter.X, m_rotationCenter.Y);
@@ -928,7 +929,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 {
                     terrainModule.LoadFromStream(terrainPath, ms);
                 }
-            ms.Close();
+            }
 
             m_log.DebugFormat("[ARCHIVER]: Restored terrain {0}", terrainPath);
 

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

@@ -569,10 +569,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             string terrainPath = String.Format("{0}{1}{2}.r32",
                 regionDir, ArchiveConstants.TERRAINS_PATH, scene.RegionInfo.RegionName);
 
-            MemoryStream ms = new MemoryStream();
+            using (MemoryStream ms = new MemoryStream())
+            {
                 scene.RequestModuleInterface<ITerrainModule>().SaveToStream(terrainPath, ms);
                 m_archiveWriter.WriteFile(terrainPath, ms.ToArray());
-            ms.Close();
+            }
 
             m_log.InfoFormat("[ARCHIVER]: Adding scene objects to archive.");
 

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

@@ -1116,9 +1116,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
             {
                 try
                 {
-                    MemoryStream terrainStream = new MemoryStream(terrainData);
+                    using (MemoryStream terrainStream = new MemoryStream(terrainData))
                         terr.LoadFromStream(filename, terrainStream);
-                    terrainStream.Close();
 
                     FileInfo x = new FileInfo(filename);
                     remoteClient.SendAlertMessage("Your terrain was loaded as a " + x.Extension + " file. It may take a few moments to appear.");

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

@@ -281,18 +281,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
             rootElement.AppendChild(result);
 
-            return DocToBytes(doc);
+            return Util.DocToBytes(doc);
         }
 
-        private byte[] DocToBytes(XmlDocument doc)
-        {
-            MemoryStream ms = new MemoryStream();
-            XmlTextWriter xw = new XmlTextWriter(ms, null);
-            xw.Formatting = Formatting.Indented;
-            doc.WriteTo(xw);
-            xw.Flush();
-
-            return ms.ToArray();
-        }
     }
 }

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

@@ -525,16 +525,13 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// </summary>
         /// <param name="avatar"></param>
         public void EventManagerOnClientMovement(ScenePresence avatar)
-        //
         {
-            ILandObject over = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
+            Vector3 pos = avatar.AbsolutePosition;
+            ILandObject over = GetLandObject(pos.X, pos.Y);
             if (over != null)
             {
-                if (!over.IsRestrictedFromLand(avatar.UUID) && (!over.IsBannedFromLand(avatar.UUID) || avatar.AbsolutePosition.Z >= LandChannel.BAN_LINE_SAFETY_HIEGHT))
+                if (!over.IsRestrictedFromLand(avatar.UUID) && (!over.IsBannedFromLand(avatar.UUID) || pos.Z >= LandChannel.BAN_LINE_SAFETY_HIEGHT))
-                {
+                    avatar.lastKnownAllowedPosition = pos;
-                    avatar.lastKnownAllowedPosition =
-                        new Vector3(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z);
-                }
             }
         }
 
@@ -858,7 +855,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     return null;
                 else
                     throw new Exception(
-                        String.Format("{0} GetLandObject for non-existant position. Region={1}, pos=<{2},{3}",
+                        String.Format("{0} GetLandObject for non-existent position. Region={1}, pos=<{2},{3}",
                                                 LogHeader, m_scene.RegionInfo.RegionName, x, y)
                 );
             }
@@ -1985,7 +1982,9 @@ namespace OpenSim.Region.CoreModules.World.Land
                 telehub = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject);
 
             // Can the user set home here?
-            if (// (a) gods and land managers can set home
+            if (// Required: local user; foreign users cannot set home
+                m_scene.UserManagementModule.IsLocalGridUser(remoteClient.AgentId) &&
+                (// (a) gods and land managers can set home
                  m_scene.Permissions.IsAdministrator(remoteClient.AgentId) || 
                  m_scene.Permissions.IsGod(remoteClient.AgentId) ||
                  // (b) land owners can set home
@@ -1993,7 +1992,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                  // (c) members of the land-associated group in roles that can set home
                  ((gpowers & (ulong)GroupPowers.AllowSetHome) == (ulong)GroupPowers.AllowSetHome) ||
                  // (d) parcels with telehubs can be the home of anyone
-                (telehub != null && land.ContainsPoint((int)telehub.AbsolutePosition.X, (int)telehub.AbsolutePosition.Y)))
+                 (telehub != null && land.ContainsPoint((int)telehub.AbsolutePosition.X, (int)telehub.AbsolutePosition.Y))))
             {
                 if (m_scene.GridUserService.SetHome(remoteClient.AgentId.ToString(), land.RegionUUID, position, lookAt))
                     // FUBAR ALERT: this needs to be "Home position set." so the viewer saves a home-screenshot.

OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs

@@ -54,14 +54,15 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
         {
             string xmlstream = GetObjectXml(scene);
 
-            MemoryStream stream = ReformatXmlString(xmlstream);
+            using (MemoryStream stream = ReformatXmlString(xmlstream))
-
+            {
                 stream.Seek(0, SeekOrigin.Begin);
                 CreateXmlFile(stream, fileName);
 
                 stream.Seek(0, SeekOrigin.Begin);
                 CreateCompressedXmlFile(stream, fileName);
             }
+        }
 
         private static MemoryStream ReformatXmlString(string xmlstream)
         {
@@ -112,13 +113,16 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
         {
             #region GZip Compressed Version
 
-            FileStream objectsFileCompressed = new FileStream(fileName + ".gzs", FileMode.Create);
+            using (FileStream objectsFileCompressed = new FileStream(fileName + ".gzs", FileMode.Create))
-            MemoryStream gzipMSStream = new MemoryStream();
+            using (MemoryStream gzipMSStream = new MemoryStream())
-            GZipStream gzipStream = new GZipStream(gzipMSStream, CompressionMode.Compress);
+            {
+                using (GZipStream gzipStream = new GZipStream(gzipMSStream, CompressionMode.Compress, true))
+                {
                     xmlStream.WriteTo(gzipStream);
+                }
+
                 gzipMSStream.WriteTo(objectsFileCompressed);
-            objectsFileCompressed.Flush();
+            }
-            objectsFileCompressed.Close();
 
             #endregion
         }

OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs

@@ -27,6 +27,7 @@
 
 using System.Collections.Generic;
 using System.IO;
+using System.Text;
 using System.Xml;
 using log4net.Config;
 using NUnit.Framework;
@@ -42,8 +43,8 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
     [TestFixture]
     public class SerialiserTests : OpenSimTestCase
     {
-        private string xml = @"
+        private const string ObjectRootPartStubXml = 
-        <SceneObjectGroup>
+@"<SceneObjectGroup>
     <RootPart>
         <SceneObjectPart xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
             <AllowedDrop>false</AllowedDrop>
@@ -159,11 +160,234 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                 </llsd>
             </DynAttrs>
         </SceneObjectPart>
-            </RootPart>
+    </RootPart>";
-            <OtherParts />
-        </SceneObjectGroup>";
 
-        private string badFloatsXml = @"
+        private const string ObjectWithNoOtherPartsXml = ObjectRootPartStubXml + 
+@"
+    <OtherParts />
+</SceneObjectGroup>";
+
+        private const string ObjectWithOtherPartsXml = ObjectRootPartStubXml + 
+@"
+  <OtherParts>
+    <Part>
+      <SceneObjectPart xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
+        <AllowedDrop>false</AllowedDrop>
+        <CreatorID><Guid>a6dacf01-4636-4bb9-8a97-30609438af9d</Guid></CreatorID>
+        <FolderID><Guid>9958feb1-02a6-49e4-a4ce-eba6f578ee13</Guid></FolderID>
+        <InventorySerial>3</InventorySerial>
+        <UUID><Guid>9958feb1-02a6-49e4-a4ce-eba6f578ee13</Guid></UUID>
+        <LocalId>1154704500</LocalId>
+        <Name>Alien Head 1</Name>
+        <Material>3</Material>
+        <PassTouches>false</PassTouches>
+        <PassCollisions>false</PassCollisions>
+        <RegionHandle>21990232560640000</RegionHandle>
+        <ScriptAccessPin>0</ScriptAccessPin>
+        <GroupPosition><X>125.5655</X><Y>127.346</Y><Z>22.48036</Z></GroupPosition>
+        <OffsetPosition><X>-0.2171936</X><Y>0.1083984</Y><Z>0.0009994507</Z></OffsetPosition>
+        <RotationOffset><X>-0.5122106</X><Y>0.4851225</Y><Z>-0.4957454</Z><W>0.5064908</W></RotationOffset>
+        <Velocity><X>0</X><Y>0</Y><Z>0</Z></Velocity>
+        <AngularVelocity><X>0</X><Y>0</Y><Z>0</Z></AngularVelocity>
+        <Acceleration><X>0</X><Y>0</Y><Z>0</Z></Acceleration>
+        <Description>(No Description)</Description>
+        <Color><R>0</R><G>0</G><B>0</B><A>255</A></Color>
+        <Text/>
+        <SitName/>
+        <TouchName/>
+        <LinkNum>253</LinkNum>
+        <ClickAction>0</ClickAction>
+        <Shape>
+          <ProfileCurve>5</ProfileCurve>
+          <TextureEntry>Vw3dpvgTRUOiIUOGsnpWlAB/f38AAAAAgL8AAACAPwAAAAAAAAAF4ABAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</TextureEntry>
+          <ExtraParams>AA==</ExtraParams>
+          <PathBegin>0</PathBegin>
+          <PathCurve>32</PathCurve>
+          <PathEnd>0</PathEnd>
+          <PathRadiusOffset>0</PathRadiusOffset>
+          <PathRevolutions>0</PathRevolutions>
+          <PathScaleX>100</PathScaleX>
+          <PathScaleY>100</PathScaleY>
+          <PathShearX>0</PathShearX>
+          <PathShearY>0</PathShearY>
+          <PathSkew>0</PathSkew>
+          <PathTaperX>0</PathTaperX>
+          <PathTaperY>0</PathTaperY>
+          <PathTwist>0</PathTwist>
+          <PathTwistBegin>0</PathTwistBegin>
+          <PCode>9</PCode>
+          <ProfileBegin>0</ProfileBegin>
+          <ProfileEnd>0</ProfileEnd>
+          <ProfileHollow>0</ProfileHollow>
+          <State>9</State>
+          <LastAttachPoint>0</LastAttachPoint>
+          <ProfileShape>HalfCircle</ProfileShape>
+          <HollowShape>Same</HollowShape>
+          <SculptTexture><Guid>00000000-0000-0000-0000-000000000000</Guid></SculptTexture>
+          <SculptType>0</SculptType>
+          <FlexiSoftness>0</FlexiSoftness>
+          <FlexiTension>0</FlexiTension>
+          <FlexiDrag>0</FlexiDrag>
+          <FlexiGravity>0</FlexiGravity>
+          <FlexiWind>0</FlexiWind>
+          <FlexiForceX>0</FlexiForceX>
+          <FlexiForceY>0</FlexiForceY>
+          <FlexiForceZ>0</FlexiForceZ>
+          <LightColorR>0</LightColorR>
+          <LightColorG>0</LightColorG>
+          <LightColorB>0</LightColorB>
+          <LightColorA>1</LightColorA>
+          <LightRadius>0</LightRadius>
+          <LightCutoff>0</LightCutoff>
+          <LightFalloff>0</LightFalloff>
+          <LightIntensity>1</LightIntensity>
+          <FlexiEntry>false</FlexiEntry>
+          <LightEntry>false</LightEntry>
+          <SculptEntry>false</SculptEntry>
+        </Shape>
+        <Scale><X>0.1148195</X><Y>0.0143891</Y><Z>0.02768878</Z></Scale>
+        <SitTargetOrientation><X>0</X><Y>0</Y><Z>0</Z><W>1</W></SitTargetOrientation>
+        <SitTargetPosition><X>0</X><Y>0</Y><Z>0</Z></SitTargetPosition>
+        <SitTargetPositionLL><X>0</X><Y>0</Y><Z>0</Z></SitTargetPositionLL>
+        <SitTargetOrientationLL><X>0</X><Y>0</Y><Z>0</Z><W>1</W></SitTargetOrientationLL>
+        <ParentID>1154704499</ParentID>
+        <CreationDate>1256611042</CreationDate>
+        <Category>0</Category>
+        <SalePrice>10</SalePrice>
+        <ObjectSaleType>0</ObjectSaleType>
+        <OwnershipCost>0</OwnershipCost>
+        <GroupID><Guid>00000000-0000-0000-0000-000000000000</Guid></GroupID>
+        <OwnerID><Guid>7b2022f0-5f19-488c-b7e5-829d8f96b448</Guid></OwnerID>
+        <LastOwnerID><Guid>7b2022f0-5f19-488c-b7e5-829d8f96b448</Guid></LastOwnerID>
+        <BaseMask>647168</BaseMask>
+        <OwnerMask>647168</OwnerMask>
+        <GroupMask>0</GroupMask>
+        <EveryoneMask>0</EveryoneMask>
+        <NextOwnerMask>581632</NextOwnerMask>
+        <Flags>None</Flags>
+        <CollisionSound><Guid>00000000-0000-0000-0000-000000000000</Guid></CollisionSound>
+        <CollisionSoundVolume>0</CollisionSoundVolume>
+        <AttachedPos><X>0</X><Y>0</Y><Z>0</Z></AttachedPos>
+        <TextureAnimation/>
+        <ParticleSystem/>
+        <PayPrice0>-2</PayPrice0>
+        <PayPrice1>-2</PayPrice1>
+        <PayPrice2>-2</PayPrice2>
+        <PayPrice3>-2</PayPrice3>
+        <PayPrice4>-2</PayPrice4>
+      </SceneObjectPart>
+    </Part>
+    <Part>
+      <SceneObjectPart xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
+        <AllowedDrop>false</AllowedDrop>
+        <CreatorID><Guid>a6dacf01-4636-4bb9-8a97-30609438af9d</Guid></CreatorID>
+        <FolderID><Guid>674b6b86-f5aa-439a-8e00-0d75bc08c80a</Guid></FolderID>
+        <InventorySerial>3</InventorySerial>
+        <UUID><Guid>674b6b86-f5aa-439a-8e00-0d75bc08c80a</Guid></UUID>
+        <LocalId>1154704501</LocalId>
+        <Name>Alien Head 2</Name>
+        <Material>3</Material>
+        <PassTouches>false</PassTouches>
+        <PassCollisions>false</PassCollisions>
+        <RegionHandle>21990232560640000</RegionHandle>
+        <ScriptAccessPin>0</ScriptAccessPin>
+        <GroupPosition><X>125.5655</X><Y>127.346</Y><Z>22.48036</Z></GroupPosition>
+        <OffsetPosition><X>-0.2490997</X><Y>0.08520126</Y><Z>0.0009002686</Z></OffsetPosition>
+        <RotationOffset><X>-0.4765368</X><Y>0.5194498</Y><Z>-0.5301372</Z><W>0.4712104</W></RotationOffset>
+        <Velocity><X>0</X><Y>0</Y><Z>0</Z></Velocity>
+        <AngularVelocity><X>0</X><Y>0</Y><Z>0</Z></AngularVelocity>
+        <Acceleration><X>0</X><Y>0</Y><Z>0</Z></Acceleration>
+        <Description>(No Description)</Description>
+        <Color><R>0</R><G>0</G><B>0</B><A>255</A></Color>
+        <Text/>
+        <SitName/>
+        <TouchName/>
+        <LinkNum>252</LinkNum>
+        <ClickAction>0</ClickAction>
+        <Shape>
+          <ProfileCurve>0</ProfileCurve>
+          <TextureEntry>Vw3dpvgTRUOiIUOGsnpWlAB/f38AAAAAgL8AAACAPwAAAAAAAAAF4ABAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</TextureEntry>
+          <ExtraParams>AA==</ExtraParams>
+          <PathBegin>0</PathBegin>
+          <PathCurve>32</PathCurve>
+          <PathEnd>0</PathEnd>
+          <PathRadiusOffset>0</PathRadiusOffset>
+          <PathRevolutions>0</PathRevolutions>
+          <PathScaleX>100</PathScaleX>
+          <PathScaleY>150</PathScaleY>
+          <PathShearX>0</PathShearX>
+          <PathShearY>0</PathShearY>
+          <PathSkew>0</PathSkew>
+          <PathTaperX>0</PathTaperX>
+          <PathTaperY>0</PathTaperY>
+          <PathTwist>0</PathTwist>
+          <PathTwistBegin>0</PathTwistBegin>
+          <PCode>9</PCode>
+          <ProfileBegin>0</ProfileBegin>
+          <ProfileEnd>0</ProfileEnd>
+          <ProfileHollow>0</ProfileHollow>
+          <State>9</State>
+          <LastAttachPoint>0</LastAttachPoint>
+          <ProfileShape>Circle</ProfileShape>
+          <HollowShape>Same</HollowShape>
+          <SculptTexture><Guid>00000000-0000-0000-0000-000000000000</Guid></SculptTexture>
+          <SculptType>0</SculptType>
+          <FlexiSoftness>0</FlexiSoftness>
+          <FlexiTension>0</FlexiTension>
+          <FlexiDrag>0</FlexiDrag>
+          <FlexiGravity>0</FlexiGravity>
+          <FlexiWind>0</FlexiWind>
+          <FlexiForceX>0</FlexiForceX>
+          <FlexiForceY>0</FlexiForceY>
+          <FlexiForceZ>0</FlexiForceZ>
+          <LightColorR>0</LightColorR>
+          <LightColorG>0</LightColorG>
+          <LightColorB>0</LightColorB>
+          <LightColorA>1</LightColorA>
+          <LightRadius>0</LightRadius>
+          <LightCutoff>0</LightCutoff>
+          <LightFalloff>0</LightFalloff>
+          <LightIntensity>1</LightIntensity>
+          <FlexiEntry>false</FlexiEntry>
+          <LightEntry>false</LightEntry>
+          <SculptEntry>false</SculptEntry>
+        </Shape>
+        <Scale><X>0.03574385</X><Y>0.05958032</Y><Z>0.04764182</Z></Scale>
+        <SitTargetOrientation><X>0</X><Y>0</Y><Z>0</Z><W>1</W></SitTargetOrientation>
+        <SitTargetPosition><X>0</X><Y>0</Y><Z>0</Z></SitTargetPosition>
+        <SitTargetPositionLL><X>0</X><Y>0</Y><Z>0</Z></SitTargetPositionLL>
+        <SitTargetOrientationLL><X>0</X><Y>0</Y><Z>0</Z><W>1</W></SitTargetOrientationLL>
+        <ParentID>1154704499</ParentID>
+        <CreationDate>1256611042</CreationDate>
+        <Category>0</Category>
+        <SalePrice>10</SalePrice>
+        <ObjectSaleType>0</ObjectSaleType>
+        <OwnershipCost>0</OwnershipCost>
+        <GroupID><Guid>00000000-0000-0000-0000-000000000000</Guid></GroupID>
+        <OwnerID><Guid>7b2022f0-5f19-488c-b7e5-829d8f96b448</Guid></OwnerID>
+        <LastOwnerID><Guid>7b2022f0-5f19-488c-b7e5-829d8f96b448</Guid></LastOwnerID>
+        <BaseMask>647168</BaseMask>
+        <OwnerMask>647168</OwnerMask>
+        <GroupMask>0</GroupMask>
+        <EveryoneMask>0</EveryoneMask>
+        <NextOwnerMask>581632</NextOwnerMask>
+        <Flags>None</Flags>
+        <CollisionSound><Guid>00000000-0000-0000-0000-000000000000</Guid></CollisionSound>
+        <CollisionSoundVolume>0</CollisionSoundVolume>
+        <AttachedPos><X>0</X><Y>0</Y><Z>0</Z></AttachedPos>
+        <TextureAnimation/>
+        <ParticleSystem/>
+        <PayPrice0>-2</PayPrice0>
+        <PayPrice1>-2</PayPrice1>
+        <PayPrice2>-2</PayPrice2>
+        <PayPrice3>-2</PayPrice3>
+        <PayPrice4>-2</PayPrice4>
+      </SceneObjectPart>
+    </Part>
+  </OtherParts>
+</SceneObjectGroup>";
+
+        private const string ObjectWithBadFloatsXml = @"
         <SceneObjectGroup>
             <RootPart>
                 <SceneObjectPart xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
@@ -270,7 +494,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             <OtherParts />
         </SceneObjectGroup>";
 
-        private string xml2 = @"
+        private const string ObjectWithNoPartsXml2 = @"
         <SceneObjectGroup>
             <SceneObjectPart xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
                 <CreatorID><UUID>b46ef588-411e-4a8b-a284-d7dcfe8e74ef</UUID></CreatorID>
@@ -377,12 +601,12 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
         }
 
         [Test]
-        public void TestDeserializeXml()
+        public void TestDeserializeXmlObjectWithNoOtherParts()
         {
             TestHelpers.InMethod();
-            //log4net.Config.XmlConfigurator.Configure();
+            TestHelpers.EnableLogging();
 
-            SceneObjectGroup so = SceneObjectSerializer.FromOriginalXmlFormat(xml);
+            SceneObjectGroup so = SceneObjectSerializer.FromOriginalXmlFormat(ObjectWithNoOtherPartsXml);
             SceneObjectPart rootPart = so.RootPart;
 
             Assert.That(rootPart.UUID, Is.EqualTo(new UUID("e6a5a05e-e8cc-4816-8701-04165e335790")));
@@ -394,13 +618,52 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             // TODO: Check other properties
         }
 
+        [Test]
+        public void TestDeserializeXmlObjectWithOtherParts()
+        {
+            TestHelpers.InMethod();
+            TestHelpers.EnableLogging();
+
+            SceneObjectGroup so = SceneObjectSerializer.FromOriginalXmlFormat(ObjectWithOtherPartsXml);
+            SceneObjectPart[] parts = so.Parts;
+            Assert.AreEqual(3, so.Parts.Length);
+
+            {
+                SceneObjectPart part = parts[0];
+
+                Assert.That(part.UUID, Is.EqualTo(new UUID("e6a5a05e-e8cc-4816-8701-04165e335790")));
+                Assert.That(part.CreatorID, Is.EqualTo(new UUID("a6dacf01-4636-4bb9-8a97-30609438af9d")));
+                Assert.That(part.Name, Is.EqualTo("PrimMyRide"));
+                OSDMap store = part.DynAttrs.GetStore("MyNamespace", "MyStore");
+                Assert.AreEqual(42, store["the answer"].AsInteger());
+            }                                    
+
+            {
+                SceneObjectPart part = parts[1];
+
+                Assert.That(part.UUID, Is.EqualTo(new UUID("9958feb1-02a6-49e4-a4ce-eba6f578ee13")));
+                Assert.That(part.CreatorID, Is.EqualTo(new UUID("a6dacf01-4636-4bb9-8a97-30609438af9d")));
+                Assert.That(part.Name, Is.EqualTo("Alien Head 1"));
+            }
+
+            {
+                SceneObjectPart part = parts[2];
+
+                Assert.That(part.UUID, Is.EqualTo(new UUID("674b6b86-f5aa-439a-8e00-0d75bc08c80a")));
+                Assert.That(part.CreatorID, Is.EqualTo(new UUID("a6dacf01-4636-4bb9-8a97-30609438af9d")));
+                Assert.That(part.Name, Is.EqualTo("Alien Head 2"));
+            }
+
+            // TODO: Check other properties
+        }
+
         [Test]
         public void TestDeserializeBadFloatsXml()
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
-            SceneObjectGroup so = SceneObjectSerializer.FromOriginalXmlFormat(badFloatsXml);
+            SceneObjectGroup so = SceneObjectSerializer.FromOriginalXmlFormat(ObjectWithBadFloatsXml);
             SceneObjectPart rootPart = so.RootPart;
 
             Assert.That(rootPart.UUID, Is.EqualTo(new UUID("e6a5a05e-e8cc-4816-8701-04165e335790")));
@@ -517,7 +780,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             TestHelpers.InMethod();
             //log4net.Config.XmlConfigurator.Configure();
 
-            SceneObjectGroup so = m_serialiserModule.DeserializeGroupFromXml2(xml2);
+            SceneObjectGroup so = m_serialiserModule.DeserializeGroupFromXml2(ObjectWithNoPartsXml2);
             SceneObjectPart rootPart = so.RootPart;
 
             Assert.That(rootPart.UUID, Is.EqualTo(new UUID("9be68fdd-f740-4a0f-9675-dfbbb536b946")));

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

@@ -1029,7 +1029,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     block.X = (ushort)minX;
                     block.Y = (ushort)minY;
                     block.Access = (byte)SimAccess.Down; // means 'simulator is offline'
-                    // block.Access = (byte)SimAccess.NonExistant;
+                    // block.Access = (byte)SimAccess.NonExistent;
                     response.Add(block);
                 }
                 // The lower 16 bits are an unsigned int16
@@ -1121,32 +1121,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 block.SizeX = (ushort)r.RegionSizeX;
                 block.SizeY = (ushort)r.RegionSizeY;
                 blocks.Add(block);
-                // If these are larger than legacy regions, create fake map entries for the covered
-                //    regions. The map system only does legacy sized regions so we have to fake map
-                //    entries for all the covered regions.
-                if (r.RegionSizeX > Constants.RegionSize || r.RegionSizeY > Constants.RegionSize)
-                {
-                    for (int x = 0; x < r.RegionSizeX / Constants.RegionSize; x++)
-                    {
-                        for (int y = 0; y < r.RegionSizeY / Constants.RegionSize; y++)
-                        {
-                            if (x == 0 && y == 0)
-                                continue;
-                            block = new MapBlockData
-                                        {
-                                            Access = r.Access,
-                                            MapImageId = r.TerrainImage,
-                                            Name = r.RegionName,
-                                            X = (ushort)((r.RegionLocX / Constants.RegionSize) + x),
-                                            Y = (ushort)((r.RegionLocY / Constants.RegionSize) + y),
-                                            SizeX = (ushort)r.RegionSizeX,
-                                            SizeY = (ushort)r.RegionSizeY
-                                        };
-                            //Child piece, so ignore it
-                            blocks.Add(block);
-                        }
-                    }
-                }
             }
             return blocks;
         }
@@ -1171,7 +1145,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
             if (myMapImageJPEG.Length == 0)
             {
-                MemoryStream imgstream = new MemoryStream();
+                MemoryStream imgstream = null;
                 Bitmap mapTexture = new Bitmap(1,1);
                 ManagedImage managedImage;
                 Image image = (Image)mapTexture;
@@ -1218,12 +1192,9 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         image.Dispose();
 
                     if (imgstream != null)
-                    {
-                        imgstream.Close();
                         imgstream.Dispose();
                 }
             }
-            }
             else
             {
                 // Use cached version so we don't have to loose our mind
@@ -1467,7 +1438,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
         public void GenerateMaptile()
         {
-            // Cannot create a map for a nonexistant heightmap
+            // Cannot create a map for a nonexistent heightmap
             if (m_scene.Heightmap == null)
                 return;
 
@@ -1578,12 +1549,20 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
         private Byte[] GenerateOverlay()
         {
-            using (Bitmap overlay = new Bitmap(256, 256))
+            // These need to be ints for bitmap generation
+            int regionSizeX = (int)m_scene.RegionInfo.RegionSizeX;
+            int regionSizeY = (int)m_scene.RegionInfo.RegionSizeY;
+
+            int landTileSize = LandManagementModule.LandUnit;
+            int regionLandTilesX = regionSizeX / landTileSize;
+            int regionLandTilesY = regionSizeY / landTileSize;
+
+            using (Bitmap overlay = new Bitmap(regionSizeX, regionSizeY))
             {
-                bool[,] saleBitmap = new bool[64, 64];
+                bool[,] saleBitmap = new bool[regionLandTilesX, regionLandTilesY];
-                for (int x = 0 ; x < 64 ; x++)
+                for (int x = 0; x < regionLandTilesX; x++)
                 {
-                    for (int y = 0 ; y < 64 ; y++)
+                    for (int y = 0; y < regionLandTilesY; y++)
                         saleBitmap[x, y] = false;
                 }
 
@@ -1596,8 +1575,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 using (Graphics g = Graphics.FromImage(overlay))
                 {
                     using (SolidBrush transparent = new SolidBrush(background))
-                        g.FillRectangle(transparent, 0, 0, 256, 256);
+                        g.FillRectangle(transparent, 0, 0, regionSizeX, regionSizeY);
-
 
                     foreach (ILandObject land in parcels)
                     {
@@ -1620,12 +1598,16 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
                     using (SolidBrush yellow = new SolidBrush(Color.FromArgb(255, 249, 223, 9)))
                     {
-                        for (int x = 0 ; x < 64 ; x++)
+                        for (int x = 0 ; x < regionLandTilesX ; x++)
                         {
-                            for (int y = 0 ; y < 64 ; y++)
+                            for (int y = 0 ; y < regionLandTilesY ; y++)
                             {
                                 if (saleBitmap[x, y])
-                                    g.FillRectangle(yellow, x * 4, 252 - (y * 4), 4, 4);
+                                    g.FillRectangle(
+                                        yellow, x * landTileSize, 
+                                        regionSizeX - landTileSize - (y * landTileSize), 
+                                        landTileSize, 
+                                        landTileSize);
                             }
                         }
                     }

OpenSim/Region/DataSnapshot/DataSnapshotManager.cs

@@ -373,7 +373,8 @@ namespace OpenSim.Region.DataSnapshot
             for (int i = 0; i < services.Length; i++)
             {
                 string url = services[i].Trim();
-                RestClient cli = new RestClient(url);
+                using (RestClient cli = new RestClient(url))
+                {
                     cli.AddQueryParameter("service", serviceName);
                     cli.AddQueryParameter("host", m_hostname);
                     cli.AddQueryParameter("port", m_listener_port);
@@ -391,6 +392,7 @@ namespace OpenSim.Region.DataSnapshot
                     {
                         m_log.Warn("[DATASNAPSHOT]: Ignoring unknown exception " + e.ToString());
                     }
+
                     byte[] response = new byte[1024];
                     // int n = 0;
                     try
@@ -406,6 +408,7 @@ namespace OpenSim.Region.DataSnapshot
                     // string responseStr = Util.UTF8.GetString(response);
                     m_log.Info("[DATASNAPSHOT]: data service " + url + " notified. Secret: " + m_Secret);
                 }
+            }
 
         }
         #endregion

OpenSim/Region/Framework/Scenes/Animation/BinBVHAnimation.cs

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -113,9 +113,11 @@ namespace OpenSim.Region.Framework.Scenes.Animation
 
         public byte[] ToBytes()
         {
-            byte[] outputbytes = new byte[0];
+            byte[] outputbytes;
 
-            BinaryWriter iostream = new BinaryWriter(new MemoryStream());
+            using (MemoryStream ms = new MemoryStream())
+            using (BinaryWriter iostream = new BinaryWriter(ms))
+            {
                 iostream.Write(BinBVHUtil.ES(Utils.UInt16ToBytes(unknown0)));
                 iostream.Write(BinBVHUtil.ES(Utils.UInt16ToBytes(unknown1)));
                 iostream.Write(BinBVHUtil.ES(Utils.IntToBytes(Priority)));
@@ -134,10 +136,11 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                     Joints[i].WriteBytesToStream(iostream, InPoint, OutPoint);
                 }
                 iostream.Write(BinBVHUtil.ES(Utils.IntToBytes(0)));
-            MemoryStream ms = (MemoryStream)iostream.BaseStream;
+            
-            outputbytes = ms.ToArray();
+                using (MemoryStream ms2 = (MemoryStream)iostream.BaseStream)
-            ms.Close();
+                    outputbytes = ms2.ToArray();
-            iostream.Close();
+            }
+
             return outputbytes;
         }
         

OpenSim/Region/Framework/Scenes/KeyframeMotion.cs

@@ -308,10 +308,11 @@ namespace OpenSim.Region.Framework.Scenes
 
             try
             {
-                MemoryStream ms = new MemoryStream(data);
+                using (MemoryStream ms = new MemoryStream(data))
+                {
                     BinaryFormatter fmt = new BinaryFormatter();
-
                     newMotion = (KeyframeMotion)fmt.Deserialize(ms);
+                }
 
                 newMotion.m_group = grp;
 
@@ -764,13 +765,15 @@ namespace OpenSim.Region.Framework.Scenes
         public Byte[] Serialize()
         {
             StopTimer();
-            MemoryStream ms = new MemoryStream();
 
-            BinaryFormatter fmt = new BinaryFormatter();
             SceneObjectGroup tmp = m_group;
             m_group = null;
             if (!m_selected && tmp != null)
                 m_serializedPosition = tmp.AbsolutePosition;
+
+            using (MemoryStream ms = new MemoryStream())
+            {
+                BinaryFormatter fmt = new BinaryFormatter();
                 fmt.Serialize(ms, this);
                 m_group = tmp;
                 if (m_running && !m_waitingCrossing)
@@ -778,6 +781,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 return ms.ToArray();
             }
+        }
 
         public void StartCrossingCheck()
         {

OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Collections;
 using System.Reflection;
 using System.Text;
+using System.Threading;
 using System.Timers;
 using System.Xml;
 using OpenMetaverse;
@@ -1226,15 +1227,20 @@ namespace OpenSim.Region.Framework.Scenes
                 agentItem.BasePermissions = taskItem.BasePermissions & (taskItem.NextPermissions | (uint)PermissionMask.Move);
                 if (taskItem.InvType == (int)InventoryType.Object)
                 {
-                    uint perms = taskItem.CurrentPermissions;
+                    // Bake the new base permissions from folded permissions
+                    // The folded perms are in the lowest 3 bits of the current perms
+                    // We use base permissions here to avoid baking the "Locked" status
+                    // into the item as it is passed.
+                    uint perms = taskItem.BasePermissions & taskItem.NextPermissions;
                     PermissionsUtil.ApplyFoldedPermissions(taskItem.CurrentPermissions, ref perms);
+                    // Avoid the "lock trap" - move must always be enabled but the above may remove it
+                    // Add it back here.
                     agentItem.BasePermissions = perms | (uint)PermissionMask.Move;
+                    // Newly given items cannot be "locked" on rez. Make sure by
+                    // setting current equal to base.
+                }
+
                 agentItem.CurrentPermissions = agentItem.BasePermissions;
-                }
-                else
-                {
-                    agentItem.CurrentPermissions = agentItem.BasePermissions & taskItem.CurrentPermissions;
-                }
 
                 agentItem.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm;
                 agentItem.NextPermissions = taskItem.NextPermissions;
@@ -1934,8 +1940,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// Rez a script into a prim's inventory from another prim
         /// </summary>
         /// <param name="remoteClient"></param>
-        /// <param name="itemID"> </param>
+        /// <param name="srcPart"> </param>
-        /// <param name="localID"></param>
+        /// <param name="destId"> </param>
+        /// <param name="pin"></param>
+        /// <param name="running"></param>
+        /// <param name="start_param"></param>
         public void RezScriptFromPrim(UUID srcId, SceneObjectPart srcPart, UUID destId, int pin, int running, int start_param)
         {
             TaskInventoryItem srcTaskItem = srcPart.Inventory.GetInventoryItem(srcId);
@@ -1955,9 +1964,8 @@ namespace OpenSim.Region.Framework.Scenes
             if (destPart == null)
             {
                 m_log.ErrorFormat(
-                        "[PRIM INVENTORY]: " +
+                    "[PRIM INVENTORY]: Could not find part {0} to insert script item {1} from {2} {3} in {4}",
-                        "Could not find script for ID {0}",
+                    destId, srcId, srcPart.Name, srcPart.UUID, Name);
-                        destId);
                 return;
             }
 
@@ -1968,12 +1976,14 @@ namespace OpenSim.Region.Framework.Scenes
                 if ((destPart.GroupID == UUID.Zero) || (destPart.GroupID != srcPart.GroupID) ||
                     ((destPart.GroupMask & (uint)PermissionMask.Modify) == 0))
                     return;
-            } else {
+            } 
+            else 
+            {
                 if ((destPart.OwnerMask & (uint)PermissionMask.Modify) == 0)
                     return;
             }
 
-            if (destPart.ScriptAccessPin != pin)
+            if (destPart.ScriptAccessPin == 0 || destPart.ScriptAccessPin != pin)
             {
                 m_log.WarnFormat(
                         "[PRIM INVENTORY]: " +
@@ -2192,34 +2202,47 @@ namespace OpenSim.Region.Framework.Scenes
         /// Returns one object if the asset is a regular object, and multiple objects for a coalesced object.
         /// </remarks>
         /// <param name="assetData">Asset data</param>
-        /// <param name="attachment">Whether the item is an attachment</param>
+        /// <param name="isAttachment">True if the object is an attachment.</param>
         /// <param name="objlist">The objects included in the asset</param>
         /// <param name="veclist">Relative positions of the objects</param>
         /// <param name="bbox">Bounding box of all the objects</param>
         /// <param name="offsetHeight">Offset in the Z axis from the centre of the bounding box
         /// to the centre of the root prim (relevant only when returning a single object)</param>
-        /// <returns>true = returning a single object; false = multiple objects</returns>
+        /// <returns>
-        public bool GetObjectsToRez(byte[] assetData, bool attachment, out List<SceneObjectGroup> objlist, out List<Vector3> veclist,
+        /// true if returning a single object or deserialization fails, false if returning the coalesced
+        /// list of objects
+        /// </returns>
+        public bool GetObjectsToRez(
+            byte[] assetData, bool isAttachment, out List<SceneObjectGroup> objlist, out List<Vector3> veclist,
             out Vector3 bbox, out float offsetHeight)
         {
             objlist = new List<SceneObjectGroup>();
             veclist = new List<Vector3>();
 
-            XmlDocument doc = new XmlDocument();
             string xmlData = Utils.BytesToString(assetData);
-            doc.LoadXml(xmlData);
-            XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
 
-            if (e == null || attachment) // Single
+            try
             {
-                SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
+                using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null))
+                {
+                    using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment }))
+                    {
+                        reader.Read();
+                        bool isSingleObject = reader.Name != "CoalescedObject";
+
+                        if (isSingleObject || isAttachment)
+                        {
+                            SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(reader);
                             objlist.Add(g);
-                veclist.Add(new Vector3(0, 0, 0));
+                            veclist.Add(Vector3.Zero);
                             bbox = g.GetAxisAlignedBoundingBox(out offsetHeight);
                             return true;
                         }
                         else
                         {                
+                            XmlDocument doc = new XmlDocument();
+                            doc.LoadXml(xmlData);
+                            XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
                             XmlElement coll = (XmlElement)e;
                             float bx = Convert.ToSingle(coll.GetAttribute("x"));
                             float by = Convert.ToSingle(coll.GetAttribute("y"));
@@ -2243,10 +2266,24 @@ namespace OpenSim.Region.Framework.Scenes
                                 float z = Convert.ToSingle(rawZ);
                                 veclist.Add(new Vector3(x, y, z));
                             }
-            }
 
                             return false;
                         }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.Error(
+                    "[AGENT INVENTORY]: Deserialization of xml failed when looking for CoalescedObject tag.  Exception ", 
+                    e);
+
+                bbox = Vector3.Zero;
+                offsetHeight = 0;
+            }
+
+            return true;
+        }
 
         /// <summary>
         /// Event Handler Rez an object into a scene

OpenSim/Region/Framework/Scenes/Scene.cs

@@ -103,7 +103,29 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// If false then physical objects are disabled, though collisions will continue as normal.
         /// </summary>
-        public bool PhysicsEnabled { get; set; }
+        public bool PhysicsEnabled 
+        { 
+            get 
+            {
+                return m_physicsEnabled;
+            }
+
+            set
+            {
+                m_physicsEnabled = value;
+
+                if (PhysicsScene != null)
+                {
+                    IPhysicsParameters physScene = PhysicsScene as IPhysicsParameters;
+
+                    if (physScene != null)
+                        physScene.SetPhysicsParameter(
+                            "Active", m_physicsEnabled.ToString(), PhysParameterEntry.APPLY_TO_NONE);
+                }
+            }
+        }
+
+        private bool m_physicsEnabled;
 
         /// <summary>
         /// If false then scripts are not enabled on the smiulator
@@ -192,7 +214,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Maximum value of the size of a physical prim in each axis
         /// </summary>
-        public float m_maxPhys = 10;
+        public float m_maxPhys = 64;
 
         /// <summary>
         /// Max prims an object will hold
@@ -201,7 +223,13 @@ namespace OpenSim.Region.Framework.Scenes
 
         public bool m_clampPrimSize;
         public bool m_trustBinaries;
-        public bool m_allowScriptCrossings;
+        public bool m_allowScriptCrossings = true;
+
+        /// <summary>
+        /// Can avatars cross from and to this region?
+        /// </summary>
+        public bool AllowAvatarCrossing { get; set; }
+
         public bool m_useFlySlow;
         public bool m_useTrashOnDelete = true;
 
@@ -210,6 +238,31 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public bool SendPeriodicAppearanceUpdates { get; set; }               
                 
+        /// <summary>
+        /// How much a root agent has to change position before updates are sent to viewers.
+        /// </summary>
+        public float RootPositionUpdateTolerance { get; set; }
+
+        /// <summary>
+        /// How much a root agent has to rotate before updates are sent to viewers.
+        /// </summary>
+        public float RootRotationUpdateTolerance { get; set; }
+
+        /// <summary>
+        /// How much a root agent has to change velocity before updates are sent to viewers.
+        /// </summary>
+        public float RootVelocityUpdateTolerance { get; set; }
+
+        /// <summary>
+        /// If greater than 1, we only send terse updates to other root agents on every n updates.
+        /// </summary>
+        public int RootTerseUpdatePeriod { get; set; }
+
+        /// <summary>
+        /// If greater than 1, we only send terse updates to child agents on every n updates.
+        /// </summary>
+        public int ChildTerseUpdatePeriod { get; set; }
+
         protected float m_defaultDrawDistance = 255.0f;
         public float DefaultDrawDistance 
         {
@@ -409,12 +462,6 @@ namespace OpenSim.Region.Framework.Scenes
 //        private int m_lastUpdate;
 //        private bool m_firstHeartbeat = true;
 
-        private UpdatePrioritizationSchemes m_priorityScheme = UpdatePrioritizationSchemes.Time;
-        private bool m_reprioritizationEnabled = true;
-        private double m_reprioritizationInterval = 5000.0;
-        private double m_rootReprioritizationDistance = 10.0;
-        private double m_childReprioritizationDistance = 20.0;
-
         private Timer m_mapGenerationTimer = new Timer();
         private bool m_generateMaptiles;
 
@@ -646,11 +693,11 @@ namespace OpenSim.Region.Framework.Scenes
         public int MonitorLandTime { get { return landMS; } }
         public int MonitorLastFrameTick { get { return m_lastFrameTick; } }
 
-        public UpdatePrioritizationSchemes UpdatePrioritizationScheme { get { return m_priorityScheme; } }
+        public UpdatePrioritizationSchemes UpdatePrioritizationScheme { get; set; }
-        public bool IsReprioritizationEnabled { get { return m_reprioritizationEnabled; } }
+        public bool IsReprioritizationEnabled { get; set; }
-        public double ReprioritizationInterval { get { return m_reprioritizationInterval; } }
+        public double ReprioritizationInterval { get; set; }
-        public double RootReprioritizationDistance { get { return m_rootReprioritizationDistance; } }
+        public double RootReprioritizationDistance { get; set; }
-        public double ChildReprioritizationDistance { get { return m_childReprioritizationDistance; } }
+        public double ChildReprioritizationDistance { get; set; }
 
         public AgentCircuitManager AuthenticateHandler
         {
@@ -713,11 +760,11 @@ namespace OpenSim.Region.Framework.Scenes
 
         #region Constructors
 
-        public Scene(RegionInfo regInfo, AgentCircuitManager authen,
+        public Scene(RegionInfo regInfo, AgentCircuitManager authen, PhysicsScene physicsScene,
                      SceneCommunicationService sceneGridService,
                      ISimulationDataService simDataService, IEstateDataService estateDataService,
                      IConfigSource config, string simulatorVersion)
-            : this(regInfo)
+            : this(regInfo, physicsScene)
         {
             m_config = config;
             MinFrameTime = 0.089f;
@@ -790,21 +837,6 @@ namespace OpenSim.Region.Framework.Scenes
             EventManager.OnLandObjectRemoved +=
                 new EventManager.LandObjectRemoved(simDataService.RemoveLandObject);
 
-            m_sceneGraph = new SceneGraph(this);
-
-            // If the scene graph has an Unrecoverable error, restart this sim.
-            // Currently the only thing that causes it to happen is two kinds of specific
-            // Physics based crashes.
-            //
-            // Out of memory
-            // Operating system has killed the plugin
-            m_sceneGraph.UnRecoverableError 
-                += () => 
-                    { 
-                        m_log.ErrorFormat("[SCENE]: Restarting region {0} due to unrecoverable physics crash", Name); 
-                        RestartNow(); 
-                    };
-
             RegisterDefaultSceneEvents();
 
             // XXX: Don't set the public property since we don't want to activate here.  This needs to be handled 
@@ -982,6 +1014,12 @@ namespace OpenSim.Region.Framework.Scenes
 
             #endregion Region Config
 
+            IConfig entityTransferConfig = m_config.Configs["EntityTransfer"];
+            if (entityTransferConfig != null)
+            {
+                AllowAvatarCrossing = entityTransferConfig.GetBoolean("AllowAvatarCrossing", AllowAvatarCrossing);
+            }
+
             #region Interest Management
 
             IConfig interestConfig = m_config.Configs["InterestManagement"];
@@ -991,21 +1029,35 @@ namespace OpenSim.Region.Framework.Scenes
 
                 try
                 {
-                    m_priorityScheme = (UpdatePrioritizationSchemes)Enum.Parse(typeof(UpdatePrioritizationSchemes), update_prioritization_scheme, true);
+                    UpdatePrioritizationScheme = (UpdatePrioritizationSchemes)Enum.Parse(typeof(UpdatePrioritizationSchemes), update_prioritization_scheme, true);
                 }
                 catch (Exception)
                 {
                     m_log.Warn("[PRIORITIZER]: UpdatePrioritizationScheme was not recognized, setting to default prioritizer Time");
-                    m_priorityScheme = UpdatePrioritizationSchemes.Time;
+                    UpdatePrioritizationScheme = UpdatePrioritizationSchemes.Time;
                 }
 
-                m_reprioritizationEnabled = interestConfig.GetBoolean("ReprioritizationEnabled", true);
+                IsReprioritizationEnabled 
-                m_reprioritizationInterval = interestConfig.GetDouble("ReprioritizationInterval", 5000.0);
+                    = interestConfig.GetBoolean("ReprioritizationEnabled", IsReprioritizationEnabled);
-                m_rootReprioritizationDistance = interestConfig.GetDouble("RootReprioritizationDistance", 10.0);
+                ReprioritizationInterval 
-                m_childReprioritizationDistance = interestConfig.GetDouble("ChildReprioritizationDistance", 20.0);
+                    = interestConfig.GetDouble("ReprioritizationInterval", ReprioritizationInterval);
+                RootReprioritizationDistance 
+                    = interestConfig.GetDouble("RootReprioritizationDistance", RootReprioritizationDistance);
+                ChildReprioritizationDistance 
+                    = interestConfig.GetDouble("ChildReprioritizationDistance", ChildReprioritizationDistance);
+
+                RootTerseUpdatePeriod = interestConfig.GetInt("RootTerseUpdatePeriod", RootTerseUpdatePeriod);
+                ChildTerseUpdatePeriod = interestConfig.GetInt("ChildTerseUpdatePeriod", ChildTerseUpdatePeriod);
+
+                RootPositionUpdateTolerance 
+                    = interestConfig.GetFloat("RootPositionUpdateTolerance", RootPositionUpdateTolerance);
+                RootRotationUpdateTolerance
+                    = interestConfig.GetFloat("RootRotationUpdateTolerance", RootRotationUpdateTolerance);
+                RootVelocityUpdateTolerance
+                    = interestConfig.GetFloat("RootVelocityUpdateTolerance", RootVelocityUpdateTolerance);
             }
 
-            m_log.DebugFormat("[SCENE]: Using the {0} prioritization scheme", m_priorityScheme);
+            m_log.DebugFormat("[SCENE]: Using the {0} prioritization scheme", UpdatePrioritizationScheme);
 
             #endregion Interest Management
 
@@ -1014,15 +1066,43 @@ namespace OpenSim.Region.Framework.Scenes
             StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats;
         }
 
-        public Scene(RegionInfo regInfo) : base(regInfo)
+        public Scene(RegionInfo regInfo, PhysicsScene physicsScene) : base(regInfo)
         {            
+            m_sceneGraph = new SceneGraph(this);
+            m_sceneGraph.PhysicsScene = physicsScene;
+
+            // If the scene graph has an Unrecoverable error, restart this sim.
+            // Currently the only thing that causes it to happen is two kinds of specific
+            // Physics based crashes.
+            //
+            // Out of memory
+            // Operating system has killed the plugin
+            m_sceneGraph.UnRecoverableError 
+                += () => 
+            { 
+                m_log.ErrorFormat("[SCENE]: Restarting region {0} due to unrecoverable physics crash", Name); 
+                RestartNow(); 
+            };
+
             PhysicalPrims = true;
             CollidablePrims = true;
             PhysicsEnabled = true;
 
+            AllowAvatarCrossing = true;
+
             PeriodicBackup = true;
             UseBackup = true;
 
+            IsReprioritizationEnabled = true;
+            UpdatePrioritizationScheme = UpdatePrioritizationSchemes.Time;
+            ReprioritizationInterval = 5000;
+
+            RootRotationUpdateTolerance = 0.1f;
+            RootVelocityUpdateTolerance = 0.001f;
+            RootPositionUpdateTolerance = 0.05f;
+            RootReprioritizationDistance = 10.0;
+            ChildReprioritizationDistance = 20.0;
+
             m_eventManager = new EventManager();
 
             m_permissions = new ScenePermissions(this);
@@ -1069,18 +1149,22 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns>True after all operations complete, throws exceptions otherwise.</returns>
         public override void OtherRegionUp(GridRegion otherRegion)
         {
-            uint xcell = Util.WorldToRegionLoc((uint)otherRegion.RegionLocX);
-            uint ycell = Util.WorldToRegionLoc((uint)otherRegion.RegionLocY);
-
-            //m_log.InfoFormat("[SCENE]: (on region {0}): Region {1} up in coords {2}-{3}", 
-            //    RegionInfo.RegionName, otherRegion.RegionName, xcell, ycell);
-
             if (RegionInfo.RegionHandle != otherRegion.RegionHandle)
             {
-                // If these are cast to INT because long + negative values + abs returns invalid data
+                //// If these are cast to INT because long + negative values + abs returns invalid data
-                int resultX = Math.Abs((int)xcell - (int)RegionInfo.RegionLocX);
+                //int resultX = Math.Abs((int)xcell - (int)RegionInfo.RegionLocX);
-                int resultY = Math.Abs((int)ycell - (int)RegionInfo.RegionLocY);
+                //int resultY = Math.Abs((int)ycell - (int)RegionInfo.RegionLocY);
-                if (resultX <= 1 && resultY <= 1)
+                //if (resultX <= 1 && resultY <= 1)
+                float dist = (float)Math.Max(DefaultDrawDistance,
+                             (float)Math.Max(RegionInfo.RegionSizeX, RegionInfo.RegionSizeY));
+                uint newRegionX, newRegionY, thisRegionX, thisRegionY;
+                Util.RegionHandleToRegionLoc(otherRegion.RegionHandle, out newRegionX, out newRegionY);
+                Util.RegionHandleToRegionLoc(RegionInfo.RegionHandle, out thisRegionX, out thisRegionY);
+
+                //m_log.InfoFormat("[SCENE]: (on region {0}): Region {1} up in coords {2}-{3}",
+                //    RegionInfo.RegionName, otherRegion.RegionName, newRegionX, newRegionY);
+
+                if (!Util.IsOutsideView(dist, thisRegionX, newRegionX, thisRegionY, newRegionY))
                 {
                     // Let the grid service module know, so this can be cached
                     m_eventManager.TriggerOnRegionUp(otherRegion);
@@ -1894,6 +1978,7 @@ namespace OpenSim.Region.Framework.Scenes
                                 RegionInfo.RegionID,
                                 RegionInfo.RegionLocX, RegionInfo.RegionLocY,
                                 RegionInfo.RegionSizeX, RegionInfo.RegionSizeY);
+
             if (error != String.Empty)
                 throw new Exception(error);
         }
@@ -2002,8 +2087,8 @@ namespace OpenSim.Region.Framework.Scenes
                 SceneObjectPart target = GetSceneObjectPart(RayTargetID);
 
                 Vector3 direction = Vector3.Normalize(RayEnd - RayStart);
-                Vector3 AXOrigin = new Vector3(RayStart.X, RayStart.Y, RayStart.Z);
+                Vector3 AXOrigin = RayStart;
-                Vector3 AXdirection = new Vector3(direction.X, direction.Y, direction.Z);
+                Vector3 AXdirection = direction;
 
                 if (target != null)
                 {
@@ -2025,13 +2110,13 @@ namespace OpenSim.Region.Framework.Scenes
                     // If we hit something
                     if (ei.HitTF)
                     {
-                        Vector3 scaleComponent = new Vector3(ei.AAfaceNormal.X, ei.AAfaceNormal.Y, ei.AAfaceNormal.Z);
+                        Vector3 scaleComponent = ei.AAfaceNormal;
                         if (scaleComponent.X != 0) ScaleOffset = scale.X;
                         if (scaleComponent.Y != 0) ScaleOffset = scale.Y;
                         if (scaleComponent.Z != 0) ScaleOffset = scale.Z;
                         ScaleOffset = Math.Abs(ScaleOffset);
-                        Vector3 intersectionpoint = new Vector3(ei.ipoint.X, ei.ipoint.Y, ei.ipoint.Z);
+                        Vector3 intersectionpoint = ei.ipoint;
-                        Vector3 normal = new Vector3(ei.normal.X, ei.normal.Y, ei.normal.Z);
+                        Vector3 normal = ei.normal;
                         // Set the position to the intersection point
                         Vector3 offset = (normal * (ScaleOffset / 2f));
                         pos = (intersectionpoint + offset);
@@ -2056,8 +2141,9 @@ namespace OpenSim.Region.Framework.Scenes
 
                     if (ei.HitTF)
                     {
-                        pos = new Vector3(ei.ipoint.X, ei.ipoint.Y, ei.ipoint.Z);
+                        pos = ei.ipoint;
-                    } else
+                    } 
+                    else
                     {
                         // fall back to our stupid functionality
                         pos = RayEnd;
@@ -3110,8 +3196,8 @@ namespace OpenSim.Region.Framework.Scenes
             if (target != null && target2 != null)
             {
                 Vector3 direction = Vector3.Normalize(RayEnd - RayStart);
-                Vector3 AXOrigin = new Vector3(RayStart.X, RayStart.Y, RayStart.Z);
+                Vector3 AXOrigin = RayStart;
-                Vector3 AXdirection = new Vector3(direction.X, direction.Y, direction.Z);
+                Vector3 AXdirection = direction;
 
                 pos = target2.AbsolutePosition;
                 //m_log.Info("[OBJECT_REZ]: TargetPos: " + pos.ToString() + ", RayStart: " + RayStart.ToString() + ", RayEnd: " + RayEnd.ToString() + ", Volume: " + Util.GetDistanceTo(RayStart,RayEnd).ToString() + ", mag1: " + Util.GetMagnitude(RayStart).ToString() + ", mag2: " + Util.GetMagnitude(RayEnd).ToString());
@@ -3132,13 +3218,13 @@ namespace OpenSim.Region.Framework.Scenes
                 if (ei.HitTF)
                 {
                     Vector3 scale = target.Scale;
-                    Vector3 scaleComponent = new Vector3(ei.AAfaceNormal.X, ei.AAfaceNormal.Y, ei.AAfaceNormal.Z);
+                    Vector3 scaleComponent = ei.AAfaceNormal;
                     if (scaleComponent.X != 0) ScaleOffset = scale.X;
                     if (scaleComponent.Y != 0) ScaleOffset = scale.Y;
                     if (scaleComponent.Z != 0) ScaleOffset = scale.Z;
                     ScaleOffset = Math.Abs(ScaleOffset);
-                    Vector3 intersectionpoint = new Vector3(ei.ipoint.X, ei.ipoint.Y, ei.ipoint.Z);
+                    Vector3 intersectionpoint = ei.ipoint;
-                    Vector3 normal = new Vector3(ei.normal.X, ei.normal.Y, ei.normal.Z);
+                    Vector3 normal = ei.normal;
                     Vector3 offset = normal * (ScaleOffset / 2f);
                     pos = intersectionpoint + offset;
 
@@ -3158,6 +3244,7 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         copy = m_sceneGraph.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID, Quaternion.Identity);
                     }
+
                     if (copy != null)
                         EventManager.TriggerObjectAddedToScene(copy);
                 }
@@ -3214,10 +3301,6 @@ namespace OpenSim.Region.Framework.Scenes
 
                 return;
             }
-            else
-            {
-                m_authenticateHandler.RemoveCircuit(agentID);
-            }
 
             // TODO: Can we now remove this lock?
             lock (acd)
@@ -3233,6 +3316,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     m_log.ErrorFormat(
                         "[SCENE]: Called RemoveClient() with agent ID {0} but no such presence is in the scene.", agentID);
+                    m_authenticateHandler.RemoveCircuit(agentID);
 
                     return;
                 }
@@ -3310,6 +3394,7 @@ namespace OpenSim.Region.Framework.Scenes
                         // Always clean these structures up so that any failure above doesn't cause them to remain in the
                         // scene with possibly bad effects (e.g. continually timing out on unacked packets and triggering
                         // the same cleanup exception continually.
+                        m_authenticateHandler.RemoveCircuit(agentID);
                         m_sceneGraph.RemoveScenePresence(agentID);
                         m_clientManager.Remove(agentID);
         
@@ -3462,7 +3547,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 foreach (string viewer in m_AllowedViewers)
                 {
-                    if (viewer == curViewer.Substring(0, viewer.Length).Trim().ToLower())
+                    if (viewer == curViewer.Substring(0, Math.Min(viewer.Length, curViewer.Length)).Trim().ToLower())
                     {
                         ViewerDenied = false;
                         break;
@@ -3479,7 +3564,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 foreach (string viewer in m_BannedViewers)
                 {
-                    if (viewer == curViewer.Substring(0, viewer.Length).Trim().ToLower())
+                    if (viewer == curViewer.Substring(0, Math.Min(viewer.Length, curViewer.Length)).Trim().ToLower())
                     {
                         ViewerDenied = true;
                         break;
@@ -4992,7 +5077,7 @@ namespace OpenSim.Region.Framework.Scenes
                 case PhysicsJointType.Ball:
                     {
                         Vector3 jointAnchor = PhysicsScene.GetJointAnchor(joint);
-                        Vector3 proxyPos = new Vector3(jointAnchor.X, jointAnchor.Y, jointAnchor.Z);
+                        Vector3 proxyPos = jointAnchor;
                         jointProxyObject.ParentGroup.UpdateGroupPosition(proxyPos); // schedules the entire group for a terse update
                     }
                     break;
@@ -5017,7 +5102,7 @@ namespace OpenSim.Region.Framework.Scenes
                             jointErrorMessage(joint, "joint.TrackedBodyName is null, joint " + joint.ObjectNameInScene);
                         }
 
-                        Vector3 proxyPos = new Vector3(jointAnchor.X, jointAnchor.Y, jointAnchor.Z);
+                        Vector3 proxyPos = jointAnchor;
                         Quaternion q = trackedBody.RotationOffset * joint.LocalRotation;
 
                         jointProxyObject.ParentGroup.UpdateGroupPosition(proxyPos); // schedules the entire group for a terse update
@@ -5118,8 +5203,8 @@ namespace OpenSim.Region.Framework.Scenes
                 y = Heightmap.Height - 1;
 
             Vector3 p0 = new Vector3(x, y, (float)Heightmap[(int)x, (int)y]);
-            Vector3 p1 = new Vector3(p0);
+            Vector3 p1 = p0;
-            Vector3 p2 = new Vector3(p0);
+            Vector3 p2 = p0;
 
             p1.X += 1.0f;
             if (p1.X < Heightmap.Width)
@@ -5505,6 +5590,9 @@ namespace OpenSim.Region.Framework.Scenes
                 return true;
             }
 
+            if (!AllowAvatarCrossing && !viaTeleport)
+                return false;
+
             // FIXME: Root agent count is currently known to be inaccurate.  This forces a recount before we check.
             // However, the long term fix is to make sure root agent count is always accurate.
             m_sceneGraph.RecalculateStats();

OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs

@@ -154,6 +154,10 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void SendChildAgentDataUpdate(AgentPosition cAgentData, ScenePresence presence)
         {
+//            m_log.DebugFormat(
+//                "[SCENE COMMUNICATION SERVICE]: Sending child agent position updates for {0} in {1}", 
+//                presence.Name, m_scene.Name);
+
             // This assumes that we know what our neighbors are.
             try
             {

OpenSim/Region/Framework/Scenes/SceneGraph.cs

@@ -1906,7 +1906,7 @@ namespace OpenSim.Region.Framework.Scenes
                 if (original == null)
                 {
                     m_log.WarnFormat(
-                        "[SCENEGRAPH]: Attempt to duplicate nonexistant prim id {0} by {1}", originalPrimID, AgentID);
+                        "[SCENEGRAPH]: Attempt to duplicate nonexistent prim id {0} by {1}", originalPrimID, AgentID);
 
                     return null;
                 }

OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

@@ -568,7 +568,7 @@ namespace OpenSim.Region.Framework.Scenes
                                     }
                                     else
                                     {
-                                        m_log.DebugFormat("[SCENE OBJECT]: Crossing avatar alreasy in transit {0} to {1}", av.Name, val);
+                                        m_log.DebugFormat("[SCENE OBJECT]: Not crossing avatar {0} to {1} because it's already in transit", av.Name, val);
                                     }
                                 }
 
@@ -902,6 +902,34 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        public void LoadScriptState(XmlReader reader)
+        {
+//            m_log.DebugFormat("[SCENE OBJECT GROUP]: Looking for script state for {0} in {1}", Name);
+
+            while (reader.ReadToFollowing("SavedScriptState"))
+            {
+//                m_log.DebugFormat("[SCENE OBJECT GROUP]: Loading script state for {0}", Name);
+
+                if (m_savedScriptState == null)
+                    m_savedScriptState = new Dictionary<UUID, string>();
+
+                string uuid = reader.GetAttribute("UUID");
+
+                if (uuid != null)
+                {
+//                    m_log.DebugFormat("[SCENE OBJECT GROUP]: Found state for item ID {0} in object {1}", uuid, Name);
+
+                    UUID itemid = new UUID(uuid);
+                    if (itemid != UUID.Zero)
+                        m_savedScriptState[itemid] = reader.ReadInnerXml();
+                }
+                else
+                {
+                    m_log.WarnFormat("[SCENE OBJECT GROUP]: SavedScriptState element had no UUID in object {0}", Name);
+                }
+            }
+        }
+
         /// <summary>
         /// Hooks this object up to the backup event so that it is persisted to the database when the update thread executes.
         /// </summary>

OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

@@ -2044,7 +2044,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="xmlReader"></param>
         /// <returns></returns>
-        public static SceneObjectPart FromXml(XmlTextReader xmlReader)
+        public static SceneObjectPart FromXml(XmlReader xmlReader)
         {
             SceneObjectPart part = SceneObjectSerializer.Xml2ToSOP(xmlReader);
 

OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs

@@ -870,8 +870,8 @@ namespace OpenSim.Region.Framework.Scenes
                 int type = m_items[itemID].InvType;
                 if (type == 10) // Script
                 {
-                    m_part.RemoveScriptEvents(itemID);
+                    // route it through here, to handle script cleanup tasks
-                    m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemID);
+                    RemoveScriptInstance(itemID, false);
                 }
                 m_items.Remove(itemID);
                 m_inventorySerial++;

OpenSim/Region/Framework/Scenes/ScenePresence.cs

@@ -286,6 +286,8 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        public bool SentInitialDataToClient { get; private set; }
+
         /// <summary>
         /// Copy of the script states while the agent is in transit. This state may
         /// need to be placed back in case of transfer fail.
@@ -343,6 +345,12 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         private object m_originRegionIDAccessLock = new object();
 
+        /// <summary>
+        /// Triggered on entity transfer after to allow CompleteMovement() to proceed after we have received an
+        /// UpdateAgent from the originating region.ddkjjkj
+        /// </summary>
+        private AutoResetEvent m_updateAgentReceivedAfterTransferEvent = new AutoResetEvent(false);
+
         /// <summary>
         /// Used by the entity transfer module to signal when the presence should not be closed because a subsequent
         /// teleport is reusing the connection.
@@ -859,6 +867,11 @@ namespace OpenSim.Region.Framework.Scenes
             get { return Util.GetViewerName(m_scene.AuthenticateHandler.GetAgentCircuitData(ControllingClient.CircuitCode)); }
         }
 
+        /// <summary>
+        /// Count of how many terse updates we have sent out.  It doesn't matter if this overflows.
+        /// </summary>
+        private int m_terseUpdateCount;
+
         #endregion
 
         #region Constructor(s)
@@ -1192,20 +1205,18 @@ namespace OpenSim.Region.Framework.Scenes
             // and it has already rezzed the attachments and started their scripts.
             // We do the following only for non-login agents, because their scripts
             // haven't started yet.
-            if (PresenceType == PresenceType.Npc || (TeleportFlags & TeleportFlags.ViaLogin) != 0)
+            if (PresenceType == PresenceType.Npc || IsRealLogin(m_teleportFlags))
             {
                 // Viewers which have a current outfit folder will actually rez their own attachments.  However,
                 // viewers without (e.g. v1 viewers) will not, so we still need to make this call.
                 if (Scene.AttachmentsModule != null)
-                    Util.FireAndForget(
-                        o => 
                 {
-//                            if (PresenceType != PresenceType.Npc && Util.FireAndForgetMethod != FireAndForgetMethod.None) 
+                    Util.FireAndForget(o =>
-//                                System.Threading.Thread.Sleep(7000); 
+                    {
-
                         Scene.AttachmentsModule.RezAttachments(this);
                     });
                 }
+            }
             else
             {
                 // We need to restart scripts here so that they receive the correct changed events (CHANGED_TELEPORT
@@ -1246,7 +1257,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
-            SendAvatarDataToAllAgents();
+            SendAvatarDataToAllClients();
 
             // send the animations of the other presences to me
             m_scene.ForEachRootScenePresence(delegate(ScenePresence presence)
@@ -1266,6 +1277,11 @@ namespace OpenSim.Region.Framework.Scenes
             return true;
         }
 
+        private static bool IsRealLogin(TeleportFlags teleportFlags)
+        {
+            return ((teleportFlags & TeleportFlags.ViaLogin) != 0) && ((teleportFlags & TeleportFlags.ViaHGLogin) == 0);
+        }
+
         /// <summary>
         /// Force viewers to show the avatar's current name.
         /// </summary>
@@ -1281,7 +1297,7 @@ namespace OpenSim.Region.Framework.Scenes
             m_log.DebugFormat("[SCENE PRESENCE]: Forcing viewers to update the avatar name for " + Name);
 
             UseFakeGroupTitle = true;
-            SendAvatarDataToAllAgents(false);
+            SendAvatarDataToAllClients(false);
 
             Util.FireAndForget(o =>
             {
@@ -1292,7 +1308,7 @@ namespace OpenSim.Region.Framework.Scenes
                 Thread.Sleep(5000);
 
                 UseFakeGroupTitle = false;
-                SendAvatarDataToAllAgents(false);
+                SendAvatarDataToAllClients(false);
             });
         }
 
@@ -1640,7 +1656,6 @@ namespace OpenSim.Region.Framework.Scenes
                 PhysicsActor.Size = size;
                 //  PhysicsActor.setAvatarSize(size, feetoffset);
             }            
-            
         }
 
         private bool WaitForUpdateAgent(IClientAPI client)
@@ -1649,21 +1664,13 @@ namespace OpenSim.Region.Framework.Scenes
             // (which triggers Scene.IncomingUpdateChildAgent(AgentData cAgentData) here in the destination, 
             // m_originRegionID is UUID.Zero; after, it's non-Zero.  The CompleteMovement sequence initiated from the
             // viewer (in turn triggered by the source region sending it a TeleportFinish event) waits until it's non-zero
-            int count = 50;
+            m_updateAgentReceivedAfterTransferEvent.WaitOne(10000);
-            UUID originID;
+
+            UUID originID = UUID.Zero;           
 
             lock (m_originRegionIDAccessLock)
                 originID = m_originRegionID;           
 
-            while (originID.Equals(UUID.Zero) && count-- > 0)
-            {
-                lock (m_originRegionIDAccessLock)
-                    originID = m_originRegionID;
-
-                m_log.DebugFormat("[SCENE PRESENCE]: Agent {0} waiting for update in {1}", client.Name, Scene.Name);
-                Thread.Sleep(200);
-            }
-
             if (originID.Equals(UUID.Zero))
             {
                 // Movement into region will fail
@@ -1691,8 +1698,13 @@ namespace OpenSim.Region.Framework.Scenes
                 "[SCENE PRESENCE]: Completing movement of {0} into region {1} in position {2}",
                 client.Name, Scene.Name, AbsolutePosition);
 
+            bool flying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0);   // Get this ahead of time because IsInTransit modifies 'm_AgentControlFlags'
+
+            IsInTransit = true;
+            try
+            {
                 // Make sure it's not a login agent. We don't want to wait for updates during login
-            if (PresenceType != PresenceType.Npc && (m_teleportFlags & TeleportFlags.ViaLogin) == 0)
+                if (!(PresenceType == PresenceType.Npc || IsRealLogin(m_teleportFlags)))
                 {
                     // Let's wait until UpdateAgent (called by departing region) is done
                     if (!WaitForUpdateAgent(client))
@@ -1719,7 +1731,6 @@ namespace OpenSim.Region.Framework.Scenes
                     AbsolutePosition = pos;
                 }
 
-            bool flying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0);
                 if (!MakeRootAgent(AbsolutePosition, flying))
                 {
                     m_log.DebugFormat(
@@ -1732,11 +1743,11 @@ namespace OpenSim.Region.Framework.Scenes
                 // Tell the client that we're totally ready
                 ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
 
-            // Remember in HandleUseCircuitCode, we delayed this to here
+                // Child agents send initial data up in LLUDPServer.HandleUseCircuitCode()
-            if (m_teleportFlags > 0)
+                if (!SentInitialDataToClient)
-                SendInitialDataToMe();
+                    SendInitialDataToClient();
 
-//            m_log.DebugFormat("[SCENE PRESENCE] Completed movement");
+    //            m_log.DebugFormat("[SCENE PRESENCE] Completed movement");
 
                 if (!string.IsNullOrEmpty(m_callbackURI))
                 {
@@ -1745,26 +1756,21 @@ namespace OpenSim.Region.Framework.Scenes
                     // here until we know for sure that the agent is active in this region.  Sending AgentMovementComplete
                     // is not enough for Imprudence clients - there appears to be a small delay (<200ms, <500ms) until they regard this
                     // region as the current region, meaning that a close sent before then will fail the teleport.
-//                System.Threading.Thread.Sleep(2000);
+    //                System.Threading.Thread.Sleep(2000);
 
                     m_log.DebugFormat(
                         "[SCENE PRESENCE]: Releasing {0} {1} with callback to {2}",
                         client.Name, client.AgentId, m_callbackURI);
 
-                UUID originID;
+                    Scene.SimulationService.ReleaseAgent(m_originRegionID, UUID, m_callbackURI);
-
-                lock (m_originRegionIDAccessLock)
-                    originID = m_originRegionID;
-
-                Scene.SimulationService.ReleaseAgent(originID, UUID, m_callbackURI);
                     m_callbackURI = null;
                 }
-//            else
+    //            else
-//            {
+    //            {
-//                m_log.DebugFormat(
+    //                m_log.DebugFormat(
-//                    "[SCENE PRESENCE]: No callback provided on CompleteMovement of {0} {1} to {2}",
+    //                    "[SCENE PRESENCE]: No callback provided on CompleteMovement of {0} {1} to {2}",
-//                    client.Name, client.AgentId, m_scene.RegionInfo.RegionName);
+    //                    client.Name, client.AgentId, m_scene.RegionInfo.RegionName);
-//            }
+    //            }
 
                 ValidateAndSendAppearanceAndAgentData();
 
@@ -1773,7 +1779,12 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
                     if (m_agentTransfer != null)
+                    {
+                        // Note: this call can take a while, because it notifies each of the simulator's neighbours.
+                        // It's important that we don't allow the avatar to cross regions meanwhile, as that will
+                        // cause serious errors. We've prevented that from happening by setting IsInTransit=true.
                         m_agentTransfer.EnableChildAgents(this);
+                    }
 
                     IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
                     if (friendsModule != null)
@@ -1790,10 +1801,14 @@ namespace OpenSim.Region.Framework.Scenes
                         sog.ScheduleGroupForFullUpdate();
                 }
 
-//            m_log.DebugFormat(
+    //            m_log.DebugFormat(
-//                "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", 
+    //                "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", 
-//                client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds);
+    //                client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds);
-
+            }
+            finally
+            {
+                IsInTransit = false;
+            }
         }
 
         /// <summary>
@@ -2638,7 +2653,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (satOnObject)
             {
-                SendAvatarDataToAllAgents();
+                SendAvatarDataToAllClients();
                 m_requestedSitTargetID = 0;
 
                 part.RemoveSittingAvatar(this);
@@ -2933,7 +2948,7 @@ namespace OpenSim.Region.Framework.Scenes
                 Animator.TrySetMovementAnimation("SIT_GROUND");
             else
                 Animator.TrySetMovementAnimation("SIT");
-            SendAvatarDataToAllAgents();
+            SendAvatarDataToAllClients();
 
             part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
         }
@@ -3048,7 +3063,7 @@ namespace OpenSim.Region.Framework.Scenes
                     sitAnimation = part.SitAnimation;
                 }
                 Animator.TrySetMovementAnimation(sitAnimation);
-                SendAvatarDataToAllAgents();
+                SendAvatarDataToAllClients();
                 TriggerScenePresenceUpdated();
             }
         }
@@ -3165,17 +3180,13 @@ namespace OpenSim.Region.Framework.Scenes
 
         public override void Update()
         {
-            const float ROTATION_TOLERANCE = 0.01f;
-            const float VELOCITY_TOLERANCE = 0.001f;
-            const float POSITION_TOLERANCE = 0.05f;
-
             if (IsChildAgent == false)
             {
                 // NOTE: Velocity is not the same as m_velocity. Velocity will attempt to
                 // grab the latest PhysicsActor velocity, whereas m_velocity is often
                 // storing a requested force instead of an actual traveling velocity
                 if (Appearance.AvatarSize != m_lastSize && !IsLoggingIn)
-                    SendAvatarDataToAllAgents();
+                    SendAvatarDataToAllClients();
 
                 // Allow any updates for sitting avatars to that llSetPrimitiveLinkParams() can work for very
                 // small increments (e.g. sit position adjusters).  An alternative may be to eliminate the tolerance
@@ -3185,9 +3196,9 @@ namespace OpenSim.Region.Framework.Scenes
                                  
                 if (!updateClients)
                     updateClients 
-                        = !Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) 
+                        = !Rotation.ApproxEquals(m_lastRotation, Scene.RootRotationUpdateTolerance) 
-                            || !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE)
+                            || !Velocity.ApproxEquals(m_lastVelocity, Scene.RootVelocityUpdateTolerance)
-                            || !m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE);
+                            || !m_pos.ApproxEquals(m_lastPosition, Scene.RootPositionUpdateTolerance);
 
                 if (updateClients)
                 {
@@ -3199,6 +3210,7 @@ namespace OpenSim.Region.Framework.Scenes
                     m_lastVelocity = Velocity;
                 }
 
+                if (Scene.AllowAvatarCrossing)
                     CheckForBorderCrossing();
 
                 CheckForSignificantMovement(); // sends update to the modules.
@@ -3209,7 +3221,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         #region Update Client(s)
 
-
         /// <summary>
         /// Sends a location update to the client connected to this scenePresence
         /// </summary>
@@ -3220,6 +3231,29 @@ namespace OpenSim.Region.Framework.Scenes
             // server.
             if (remoteClient.IsActive)
             {
+                if (Scene.RootTerseUpdatePeriod > 1)
+                {
+//                    Console.WriteLine(
+//                        "{0} {1} {2} {3} {4} {5} for {6} to {7}", 
+//                        remoteClient.AgentId, UUID, remoteClient.SceneAgent.IsChildAgent, m_terseUpdateCount, Scene.RootTerseUpdatePeriod, Velocity.ApproxEquals(Vector3.Zero, 0.001f), Name, remoteClient.Name);
+                    if (remoteClient.AgentId != UUID
+                        && !remoteClient.SceneAgent.IsChildAgent
+                        && m_terseUpdateCount % Scene.RootTerseUpdatePeriod != 0 
+                        && !Velocity.ApproxEquals(Vector3.Zero, 0.001f))
+                    {
+//                        m_log.DebugFormat("[SCENE PRESENCE]: Discarded update from {0} to {1}, args {2} {3} {4} {5} {6} {7}",
+//                            Name, remoteClient.Name, remoteClient.AgentId, UUID, remoteClient.SceneAgent.IsChildAgent, m_terseUpdateCount, Scene.RootTerseUpdatePeriod, Velocity.ApproxEquals(Vector3.Zero, 0.001f));
+
+                        return;
+                    }
+                }
+
+                if (Scene.ChildTerseUpdatePeriod > 1 
+                    && remoteClient.SceneAgent.IsChildAgent
+                    && m_terseUpdateCount % Scene.ChildTerseUpdatePeriod != 0 
+                    && !Velocity.ApproxEquals(Vector3.Zero, 0.001f))
+                        return;
+
                 //m_log.DebugFormat("[SCENE PRESENCE]: " + Name + " sending TerseUpdate to " + remoteClient.Name + " : Pos={0} Rot={1} Vel={2}", m_pos, Rotation, m_velocity);
 
                 remoteClient.SendEntityUpdate(
@@ -3257,7 +3291,11 @@ namespace OpenSim.Region.Framework.Scenes
             float distanceError = Vector3.Distance(OffsetPosition, expectedPosition);
 
             float speed = Velocity.Length();
-            float velocidyDiff = Vector3.Distance(lastVelocitySentToAllClients, Velocity);
+            float velocityDiff = Vector3.Distance(lastVelocitySentToAllClients, Velocity);
+
+//            m_log.DebugFormat(
+//                "[SCENE PRESENCE]: Delta-v {0}, lastVelocity {1}, Velocity {2} for {3} in {4}",
+//                velocidyDiff, lastVelocitySentToAllClients, Velocity, Name, Scene.Name);
 
             // assuming 5 ms. worst case precision for timer, use 2x that 
             // for distance error threshold
@@ -3265,12 +3303,18 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (speed < 0.01f // allow rotation updates if avatar position is unchanged
                 || Math.Abs(distanceError) > distanceErrorThreshold
-                || velocidyDiff > 0.01f) // did velocity change from last update?
+                || velocityDiff > 0.01f) // did velocity change from last update?
             {
+//                m_log.DebugFormat(
+//                    "[SCENE PRESENCE]: Update triggered with speed {0}, distanceError {1}, distanceThreshold {2}, delta-v {3} for {4} in {5}", 
+//                    speed, distanceError, distanceErrorThreshold, velocidyDiff, Name, Scene.Name);
+
                 lastVelocitySentToAllClients = Velocity;
                 lastTerseUpdateToAllClientsTick = currentTick;
                 lastPositionSentToAllClients = OffsetPosition;
 
+                m_terseUpdateCount++;
+
 //                Console.WriteLine("Scheduled update for {0} in {1}", Name, Scene.Name);
                 m_scene.ForEachClient(SendTerseUpdateToClient);
             }
@@ -3297,16 +3341,22 @@ namespace OpenSim.Region.Framework.Scenes
             ControllingClient.SendCoarseLocationUpdate(avatarUUIDs, coarseLocations);
         }
 
-        public void SendInitialDataToMe()
+        public void SendInitialDataToClient()
         {
+            SentInitialDataToClient = true;
+
             // Send all scene object to the new client
             Util.RunThreadNoTimeout(delegate
             {
+//                m_log.DebugFormat(
+//                    "[SCENE PRESENCE]: Sending initial data to {0} agent {1} in {2}, tp flags {3}", 
+//                    IsChildAgent ? "child" : "root", Name, Scene.Name, m_teleportFlags);
+
                 // we created a new ScenePresence (a new child agent) in a fresh region.
                 // Request info about all the (root) agents in this region
                 // Note: This won't send data *to* other clients in that region (children don't send)
-                SendOtherAgentsAvatarDataToMe();
+                SendOtherAgentsAvatarDataToClient();
-                SendOtherAgentsAppearanceToMe();
+                SendOtherAgentsAppearanceToClient();
 
                 EntityBase[] entities = Scene.Entities.GetEntities();
                 foreach (EntityBase e in entities)
@@ -3315,7 +3365,7 @@ namespace OpenSim.Region.Framework.Scenes
                         ((SceneObjectGroup)e).SendFullUpdateToClient(ControllingClient);
                 }
 
-            }, "SendInitialDataToMe", null);
+            }, "SendInitialDataToClient", null);
         }
 
         /// <summary>
@@ -3348,10 +3398,10 @@ namespace OpenSim.Region.Framework.Scenes
             // getting other avatars information was initiated elsewhere immediately after the child circuit connected... don't do it
             // again here... this comes after the cached appearance check because the avatars
             // appearance goes into the avatar update packet
-            SendAvatarDataToAllAgents();
+            SendAvatarDataToAllClients();
 
             // This invocation always shows up in the viewer logs as an error.  Is it needed?
-            SendAppearanceToAgent(this);
+            SendAppearanceToClient(this);
 
             // If we are using the the cached appearance then send it out to everyone
             if (cachedappearance)
@@ -3361,20 +3411,20 @@ namespace OpenSim.Region.Framework.Scenes
                 // If the avatars baked textures are all in the cache, then we have a 
                 // complete appearance... send it out, if not, then we'll send it when
                 // the avatar finishes updating its appearance
-                SendAppearanceToAllOtherAgents();
+                SendAppearanceToAllOtherClients();
             }
         }
 
-        public void SendAvatarDataToAllAgents()
+        public void SendAvatarDataToAllClients()
         {
-            SendAvatarDataToAllAgents(true);
+            SendAvatarDataToAllClients(true);
         }
 
         /// <summary>
         /// Send this agent's avatar data to all other root and child agents in the scene
         /// This agent must be root. This avatar will receive its own update. 
         /// </summary>
-        public void SendAvatarDataToAllAgents(bool full)
+        public void SendAvatarDataToAllClients(bool full)
         {
             //m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToAllAgents: {0} ({1})", Name, UUID);
             // only send update from root agents to other clients; children are only "listening posts"
@@ -3393,7 +3443,7 @@ namespace OpenSim.Region.Framework.Scenes
             m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence)
             {
                 if (full)
-                    SendAvatarDataToAgent(scenePresence);
+                    SendAvatarDataToClient(scenePresence);
                 else
                     scenePresence.ControllingClient.SendAvatarDataImmediate(this);
                 count++;
@@ -3406,7 +3456,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// Send avatar data for all other root agents to this agent, this agent
         /// can be either a child or root
         /// </summary>
-        public void SendOtherAgentsAvatarDataToMe()
+        public void SendOtherAgentsAvatarDataToClient()
         {
             int count = 0;
             m_scene.ForEachRootScenePresence(delegate(ScenePresence scenePresence)
@@ -3415,7 +3465,7 @@ namespace OpenSim.Region.Framework.Scenes
                             if (scenePresence.UUID == UUID)
                                 return;
                                              
-                            scenePresence.SendAvatarDataToAgent(this);
+                            scenePresence.SendAvatarDataToClient(this);
                             count++;
                         });
 
@@ -3426,9 +3476,9 @@ namespace OpenSim.Region.Framework.Scenes
         /// Send avatar data to an agent.
         /// </summary>
         /// <param name="avatar"></param>
-        public void SendAvatarDataToAgent(ScenePresence avatar)
+        public void SendAvatarDataToClient(ScenePresence avatar)
         {
-            //m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToAgent from {0} ({1}) to {2} ({3})", Name, UUID, avatar.Name, avatar.UUID);
+            //m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToClient from {0} ({1}) to {2} ({3})", Name, UUID, avatar.Name, avatar.UUID);
 
             avatar.ControllingClient.SendAvatarDataImmediate(this);
             Animator.SendAnimPackToClient(avatar.ControllingClient);
@@ -3438,9 +3488,9 @@ namespace OpenSim.Region.Framework.Scenes
         /// Send this agent's appearance to all other root and child agents in the scene
         /// This agent must be root.
         /// </summary>
-        public void SendAppearanceToAllOtherAgents()
+        public void SendAppearanceToAllOtherClients()
         {
-//            m_log.DebugFormat("[SCENE PRESENCE] SendAppearanceToAllOtherAgents: {0} {1}", Name, UUID);
+//            m_log.DebugFormat("[SCENE PRESENCE] SendAppearanceToAllOtherClients: {0} {1}", Name, UUID);
 
             // only send update from root agents to other clients; children are only "listening posts"
             if (IsChildAgent)
@@ -3459,7 +3509,7 @@ namespace OpenSim.Region.Framework.Scenes
                             if (scenePresence.UUID == UUID)
                                 return;
 
-                            SendAppearanceToAgent(scenePresence);
+                            SendAppearanceToClient(scenePresence);
                             count++;
                         });
 
@@ -3470,9 +3520,9 @@ namespace OpenSim.Region.Framework.Scenes
         /// Send appearance from all other root agents to this agent. this agent
         /// can be either root or child
         /// </summary>
-        public void SendOtherAgentsAppearanceToMe()
+        public void SendOtherAgentsAppearanceToClient()
         {
-//            m_log.DebugFormat("[SCENE PRESENCE] SendOtherAgentsAppearanceToMe: {0} {1}", Name, UUID);
+//            m_log.DebugFormat("[SCENE PRESENCE] SendOtherAgentsAppearanceToClient {0} {1}", Name, UUID);
 
             int count = 0;
             m_scene.ForEachRootScenePresence(delegate(ScenePresence scenePresence)
@@ -3481,7 +3531,7 @@ namespace OpenSim.Region.Framework.Scenes
                             if (scenePresence.UUID == UUID)
                                 return;
                                              
-                            scenePresence.SendAppearanceToAgent(this);
+                            scenePresence.SendAppearanceToClient(this);
                             count++;
                         });
 
@@ -3492,7 +3542,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// Send appearance data to an agent.
         /// </summary>
         /// <param name="avatar"></param>
-        public void SendAppearanceToAgent(ScenePresence avatar)
+        public void SendAppearanceToClient(ScenePresence avatar)
         {
 //            m_log.DebugFormat(
 //                "[SCENE PRESENCE]: Sending appearance data from {0} {1} to {2} {3}", Name, m_uuid, avatar.Name, avatar.UUID);
@@ -3579,8 +3629,9 @@ namespace OpenSim.Region.Framework.Scenes
             if (ParentID != 0 || PhysicsActor == null || ParentUUID != UUID.Zero)
                 return;
 
-            if (!IsInTransit)
+            if (IsInTransit)
-            {
+                return;
+
             Vector3 pos2 = AbsolutePosition;
             Vector3 origPosition = pos2;
             Vector3 vel = Velocity;
@@ -3593,10 +3644,9 @@ namespace OpenSim.Region.Framework.Scenes
             pos2.Y = pos2.Y + (vel.Y * timeStep);
             pos2.Z = pos2.Z + (vel.Z * timeStep);
 
-                if (!IsInTransit)
+            if (m_scene.PositionIsInCurrentRegion(pos2))
-                {
+                return;
-                    if (!m_scene.PositionIsInCurrentRegion(pos2))
+
-                    {
             m_log.DebugFormat("{0} CheckForBorderCrossing: position outside region. {1} in {2} at pos {3}", 
                                     LogHeader, Name, Scene.Name, pos2);
 
@@ -3624,21 +3674,6 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
         }
-                }
-                else
-                {
-                    // This constant has been inferred from experimentation
-                    // I'm not sure what this value should be, so I tried a few values.
-                    timeStep = 0.04f;
-                    pos2 = AbsolutePosition;
-                    pos2.X = pos2.X + (vel.X * timeStep);
-                    pos2.Y = pos2.Y + (vel.Y * timeStep);
-                    // Don't touch the Z
-                    m_pos = pos2;
-                    m_log.DebugFormat("[SCENE PRESENCE]: In transit m_pos={0}", m_pos);
-                }
-            }   
-        }
 
         // Given a position, make sure it is within the current region.
         // If just outside some border, the returned position will be just inside the border on that side.
@@ -3725,7 +3760,9 @@ namespace OpenSim.Region.Framework.Scenes
 
 //                    m_log.Debug("---> x: " + x + "; newx:" + newRegionX + "; Abs:" + (int)Math.Abs((int)(x - newRegionX)));
 //                    m_log.Debug("---> y: " + y + "; newy:" + newRegionY + "; Abs:" + (int)Math.Abs((int)(y - newRegionY)));
-                    if (Util.IsOutsideView(DrawDistance, x, newRegionX, y, newRegionY))
+                    float dist = (float)Math.Max(Scene.DefaultDrawDistance,
+                            (float)Math.Max(Scene.RegionInfo.RegionSizeX, Scene.RegionInfo.RegionSizeY));
+                    if (Util.IsOutsideView(dist, x, newRegionX, y, newRegionY))
                     {
                         byebyeRegions.Add(handle);
                     }
@@ -3788,6 +3825,8 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
 
             CopyFrom(cAgentData);
+
+            m_updateAgentReceivedAfterTransferEvent.Set();
         }
 
         private static Vector3 marker = new Vector3(-1f, -1f, -1f);

OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs

@@ -58,58 +58,60 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         /// <param name="xmlData"></param>
         /// <returns>The scene object deserialized.  Null on failure.</returns>
         public static SceneObjectGroup FromOriginalXmlFormat(string xmlData)
+        {
+            using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null))
+                using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment }))
+                    return FromOriginalXmlFormat(reader);
+        }
+
+        /// <summary>
+        /// Deserialize a scene object from the original xml format
+        /// </summary>
+        /// <param name="xmlData"></param>
+        /// <returns>The scene object deserialized.  Null on failure.</returns>
+        public static SceneObjectGroup FromOriginalXmlFormat(XmlReader reader)
         {
             //m_log.DebugFormat("[SOG]: Starting deserialization of SOG");
             //int time = System.Environment.TickCount;
 
+            SceneObjectGroup sceneObject = null;
+
             try
             {
-                StringReader  sr;
-                XmlTextReader reader;
-                XmlNodeList   parts;
-                XmlDocument   doc;
                 int           linkNum;
 
-                doc = new XmlDocument();
+                reader.ReadToFollowing("RootPart");
-                doc.LoadXml(xmlData);
+                reader.ReadToFollowing("SceneObjectPart");
-                parts = doc.GetElementsByTagName("RootPart");
+                sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(reader));
+                reader.ReadToFollowing("OtherParts");
 
-                if (parts.Count == 0)
+                if (reader.ReadToDescendant("Part"))
-                    throw new Exception("Invalid Xml format - no root part");
+                {
-
+                    do
-                sr = new StringReader(parts[0].InnerXml);
+                    {
-                reader = new XmlTextReader(sr);
+                        if (reader.ReadToDescendant("SceneObjectPart"))
-                SceneObjectGroup sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(reader));
-                reader.Close();
-                sr.Close();
-
-                parts = doc.GetElementsByTagName("Part");
-
-                for (int i = 0; i < parts.Count; i++)
                         {
-                    sr = new StringReader(parts[i].InnerXml);
-                    reader = new XmlTextReader(sr);
                             SceneObjectPart part = SceneObjectPart.FromXml(reader);
                             linkNum = part.LinkNum;
                             sceneObject.AddPart(part);
                             part.LinkNum = linkNum;
                             part.TrimPermissions();
-                    reader.Close();
+                        }
-                    sr.Close();
+                    }                    
+                    while (reader.ReadToNextSibling("Part"));
                 }
 
                 // Script state may, or may not, exist. Not having any, is NOT
                 // ever a problem.
-                sceneObject.LoadScriptState(doc);
+                sceneObject.LoadScriptState(reader);
-
-                return sceneObject;
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat(
+                m_log.ErrorFormat("[SERIALIZER]: Deserialization of xml failed.  Exception {0}", e);
-                    "[SERIALIZER]: Deserialization of xml failed with {0}.  xml was {1}", e, xmlData);
                 return null;
             }
+
+            return sceneObject;
         }
 
         /// <summary>
@@ -369,14 +371,14 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
         #region manual serialization
 
-        private static Dictionary<string, Action<SceneObjectPart, XmlTextReader>> m_SOPXmlProcessors
+        private static Dictionary<string, Action<SceneObjectPart, XmlReader>> m_SOPXmlProcessors
-            = new Dictionary<string, Action<SceneObjectPart, XmlTextReader>>();
+            = new Dictionary<string, Action<SceneObjectPart, XmlReader>>();
 
-        private static Dictionary<string, Action<TaskInventoryItem, XmlTextReader>> m_TaskInventoryXmlProcessors
+        private static Dictionary<string, Action<TaskInventoryItem, XmlReader>> m_TaskInventoryXmlProcessors
-            = new Dictionary<string, Action<TaskInventoryItem, XmlTextReader>>();
+            = new Dictionary<string, Action<TaskInventoryItem, XmlReader>>();
 
-        private static Dictionary<string, Action<PrimitiveBaseShape, XmlTextReader>> m_ShapeXmlProcessors
+        private static Dictionary<string, Action<PrimitiveBaseShape, XmlReader>> m_ShapeXmlProcessors
-            = new Dictionary<string, Action<PrimitiveBaseShape, XmlTextReader>>();
+            = new Dictionary<string, Action<PrimitiveBaseShape, XmlReader>>();
 
         static SceneObjectSerializer()
         {
@@ -532,112 +534,112 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         }
 
         #region SOPXmlProcessors
-        private static void ProcessAllowedDrop(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessAllowedDrop(SceneObjectPart obj, XmlReader reader)
         {
             obj.AllowedDrop = Util.ReadBoolean(reader);
         }
 
-        private static void ProcessCreatorID(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessCreatorID(SceneObjectPart obj, XmlReader reader)
         {
             obj.CreatorID = Util.ReadUUID(reader, "CreatorID");
         }
 
-        private static void ProcessCreatorData(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessCreatorData(SceneObjectPart obj, XmlReader reader)
         {
             obj.CreatorData = reader.ReadElementContentAsString("CreatorData", String.Empty);
         }
 
-        private static void ProcessFolderID(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessFolderID(SceneObjectPart obj, XmlReader reader)
         {
             obj.FolderID = Util.ReadUUID(reader, "FolderID");
         }
 
-        private static void ProcessInventorySerial(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessInventorySerial(SceneObjectPart obj, XmlReader reader)
         {
             obj.InventorySerial = (uint)reader.ReadElementContentAsInt("InventorySerial", String.Empty);
         }
 
-        private static void ProcessTaskInventory(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessTaskInventory(SceneObjectPart obj, XmlReader reader)
         {
             obj.TaskInventory = ReadTaskInventory(reader, "TaskInventory");
         }
 
-        private static void ProcessUUID(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessUUID(SceneObjectPart obj, XmlReader reader)
         {
             obj.UUID = Util.ReadUUID(reader, "UUID");
         }
 
-        private static void ProcessLocalId(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessLocalId(SceneObjectPart obj, XmlReader reader)
         {
             obj.LocalId = (uint)reader.ReadElementContentAsLong("LocalId", String.Empty);
         }
 
-        private static void ProcessName(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessName(SceneObjectPart obj, XmlReader reader)
         {
             obj.Name = reader.ReadElementString("Name");
         }
 
-        private static void ProcessMaterial(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessMaterial(SceneObjectPart obj, XmlReader reader)
         {
             obj.Material = (byte)reader.ReadElementContentAsInt("Material", String.Empty);
         }
 
-        private static void ProcessPassTouches(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessPassTouches(SceneObjectPart obj, XmlReader reader)
         {
             obj.PassTouches = Util.ReadBoolean(reader);
         }
 
-        private static void ProcessPassCollisions(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessPassCollisions(SceneObjectPart obj, XmlReader reader)
         {
             obj.PassCollisions = Util.ReadBoolean(reader);
         }
 
-        private static void ProcessRegionHandle(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessRegionHandle(SceneObjectPart obj, XmlReader reader)
         {
             obj.RegionHandle = (ulong)reader.ReadElementContentAsLong("RegionHandle", String.Empty);
         }
 
-        private static void ProcessScriptAccessPin(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessScriptAccessPin(SceneObjectPart obj, XmlReader reader)
         {
             obj.ScriptAccessPin = reader.ReadElementContentAsInt("ScriptAccessPin", String.Empty);
         }
 
-        private static void ProcessGroupPosition(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessGroupPosition(SceneObjectPart obj, XmlReader reader)
         {
             obj.GroupPosition = Util.ReadVector(reader, "GroupPosition");
         }
 
-        private static void ProcessOffsetPosition(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessOffsetPosition(SceneObjectPart obj, XmlReader reader)
         {
             obj.OffsetPosition = Util.ReadVector(reader, "OffsetPosition"); ;
         }
 
-        private static void ProcessRotationOffset(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessRotationOffset(SceneObjectPart obj, XmlReader reader)
         {
             obj.RotationOffset = Util.ReadQuaternion(reader, "RotationOffset");
         }
 
-        private static void ProcessVelocity(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessVelocity(SceneObjectPart obj, XmlReader reader)
         {
             obj.Velocity = Util.ReadVector(reader, "Velocity");
         }
 
-        private static void ProcessAngularVelocity(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessAngularVelocity(SceneObjectPart obj, XmlReader reader)
         {
             obj.AngularVelocity = Util.ReadVector(reader, "AngularVelocity");
         }
 
-        private static void ProcessAcceleration(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessAcceleration(SceneObjectPart obj, XmlReader reader)
         {
             obj.Acceleration = Util.ReadVector(reader, "Acceleration");
         }
 
-        private static void ProcessDescription(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessDescription(SceneObjectPart obj, XmlReader reader)
         {
             obj.Description = reader.ReadElementString("Description");
         }
 
-        private static void ProcessColor(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessColor(SceneObjectPart obj, XmlReader reader)
         {
             reader.ReadStartElement("Color");
             if (reader.Name == "R")
@@ -651,57 +653,57 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             }
         }
 
-        private static void ProcessText(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessText(SceneObjectPart obj, XmlReader reader)
         {
             obj.Text = reader.ReadElementString("Text", String.Empty);
         }
 
-        private static void ProcessSitName(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessSitName(SceneObjectPart obj, XmlReader reader)
         {
             obj.SitName = reader.ReadElementString("SitName", String.Empty);
         }
 
-        private static void ProcessTouchName(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessTouchName(SceneObjectPart obj, XmlReader reader)
         {
             obj.TouchName = reader.ReadElementString("TouchName", String.Empty);
         }
 
-        private static void ProcessLinkNum(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessLinkNum(SceneObjectPart obj, XmlReader reader)
         {
             obj.LinkNum = reader.ReadElementContentAsInt("LinkNum", String.Empty);
         }
 
-        private static void ProcessClickAction(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessClickAction(SceneObjectPart obj, XmlReader reader)
         {
             obj.ClickAction = (byte)reader.ReadElementContentAsInt("ClickAction", String.Empty);
         }
 
-        private static void ProcessPhysicsShapeType(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessPhysicsShapeType(SceneObjectPart obj, XmlReader reader)
         {
             obj.PhysicsShapeType = (byte)reader.ReadElementContentAsInt("PhysicsShapeType", String.Empty);
         }
 
-        private static void ProcessDensity(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessDensity(SceneObjectPart obj, XmlReader reader)
         {
             obj.Density = reader.ReadElementContentAsFloat("Density", String.Empty);
         }
 
-        private static void ProcessFriction(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessFriction(SceneObjectPart obj, XmlReader reader)
         {
             obj.Friction = reader.ReadElementContentAsFloat("Friction", String.Empty);
         }
 
-        private static void ProcessBounce(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessBounce(SceneObjectPart obj, XmlReader reader)
         {
             obj.Restitution = reader.ReadElementContentAsFloat("Bounce", String.Empty);
         }
 
-        private static void ProcessGravityModifier(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessGravityModifier(SceneObjectPart obj, XmlReader reader)
         {
             obj.GravityModifier = reader.ReadElementContentAsFloat("GravityModifier", String.Empty);
         }
 
-        private static void ProcessShape(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessShape(SceneObjectPart obj, XmlReader reader)
         {
             List<string> errorNodeNames;
             obj.Shape = ReadShape(reader, "Shape", out errorNodeNames);
@@ -714,163 +716,163 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             }
         }
 
-        private static void ProcessScale(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessScale(SceneObjectPart obj, XmlReader reader)
         {
             obj.Scale = Util.ReadVector(reader, "Scale");
         }
 
-        private static void ProcessSitTargetOrientation(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessSitTargetOrientation(SceneObjectPart obj, XmlReader reader)
         {
             obj.SitTargetOrientation = Util.ReadQuaternion(reader, "SitTargetOrientation");
         }
 
-        private static void ProcessSitTargetPosition(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessSitTargetPosition(SceneObjectPart obj, XmlReader reader)
         {
             obj.SitTargetPosition = Util.ReadVector(reader, "SitTargetPosition");
         }
 
-        private static void ProcessSitTargetPositionLL(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessSitTargetPositionLL(SceneObjectPart obj, XmlReader reader)
         {
             obj.SitTargetPositionLL = Util.ReadVector(reader, "SitTargetPositionLL");
         }
 
-        private static void ProcessSitTargetOrientationLL(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessSitTargetOrientationLL(SceneObjectPart obj, XmlReader reader)
         {
             obj.SitTargetOrientationLL = Util.ReadQuaternion(reader, "SitTargetOrientationLL");
         }
 
-        private static void ProcessParentID(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessParentID(SceneObjectPart obj, XmlReader reader)
         {
             string str = reader.ReadElementContentAsString("ParentID", String.Empty);
             obj.ParentID = Convert.ToUInt32(str);
         }
 
-        private static void ProcessCreationDate(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessCreationDate(SceneObjectPart obj, XmlReader reader)
         {
             obj.CreationDate = reader.ReadElementContentAsInt("CreationDate", String.Empty);
         }
 
-        private static void ProcessCategory(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessCategory(SceneObjectPart obj, XmlReader reader)
         {
             obj.Category = (uint)reader.ReadElementContentAsInt("Category", String.Empty);
         }
 
-        private static void ProcessSalePrice(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessSalePrice(SceneObjectPart obj, XmlReader reader)
         {
             obj.SalePrice = reader.ReadElementContentAsInt("SalePrice", String.Empty);
         }
 
-        private static void ProcessObjectSaleType(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessObjectSaleType(SceneObjectPart obj, XmlReader reader)
         {
             obj.ObjectSaleType = (byte)reader.ReadElementContentAsInt("ObjectSaleType", String.Empty);
         }
 
-        private static void ProcessOwnershipCost(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessOwnershipCost(SceneObjectPart obj, XmlReader reader)
         {
             obj.OwnershipCost = reader.ReadElementContentAsInt("OwnershipCost", String.Empty);
         }
 
-        private static void ProcessGroupID(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessGroupID(SceneObjectPart obj, XmlReader reader)
         {
             obj.GroupID = Util.ReadUUID(reader, "GroupID");
         }
 
-        private static void ProcessOwnerID(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessOwnerID(SceneObjectPart obj, XmlReader reader)
         {
             obj.OwnerID = Util.ReadUUID(reader, "OwnerID");
         }
 
-        private static void ProcessLastOwnerID(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessLastOwnerID(SceneObjectPart obj, XmlReader reader)
         {
             obj.LastOwnerID = Util.ReadUUID(reader, "LastOwnerID");
         }
 
-        private static void ProcessBaseMask(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessBaseMask(SceneObjectPart obj, XmlReader reader)
         {
             obj.BaseMask = (uint)reader.ReadElementContentAsInt("BaseMask", String.Empty);
         }
 
-        private static void ProcessOwnerMask(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessOwnerMask(SceneObjectPart obj, XmlReader reader)
         {
             obj.OwnerMask = (uint)reader.ReadElementContentAsInt("OwnerMask", String.Empty);
         }
 
-        private static void ProcessGroupMask(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessGroupMask(SceneObjectPart obj, XmlReader reader)
         {
             obj.GroupMask = (uint)reader.ReadElementContentAsInt("GroupMask", String.Empty);
         }
 
-        private static void ProcessEveryoneMask(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessEveryoneMask(SceneObjectPart obj, XmlReader reader)
         {
             obj.EveryoneMask = (uint)reader.ReadElementContentAsInt("EveryoneMask", String.Empty);
         }
 
-        private static void ProcessNextOwnerMask(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessNextOwnerMask(SceneObjectPart obj, XmlReader reader)
         {
             obj.NextOwnerMask = (uint)reader.ReadElementContentAsInt("NextOwnerMask", String.Empty);
         }
 
-        private static void ProcessFlags(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessFlags(SceneObjectPart obj, XmlReader reader)
         {
             obj.Flags = Util.ReadEnum<PrimFlags>(reader, "Flags");
         }
 
-        private static void ProcessCollisionSound(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessCollisionSound(SceneObjectPart obj, XmlReader reader)
         {
             obj.CollisionSound = Util.ReadUUID(reader, "CollisionSound");
         }
 
-        private static void ProcessCollisionSoundVolume(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessCollisionSoundVolume(SceneObjectPart obj, XmlReader reader)
         {
             obj.CollisionSoundVolume = reader.ReadElementContentAsFloat("CollisionSoundVolume", String.Empty);
         }
 
-        private static void ProcessMediaUrl(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessMediaUrl(SceneObjectPart obj, XmlReader reader)
         {
             obj.MediaUrl = reader.ReadElementContentAsString("MediaUrl", String.Empty);
         }
 
-        private static void ProcessAttachedPos(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessAttachedPos(SceneObjectPart obj, XmlReader reader)
         {
             obj.AttachedPos = Util.ReadVector(reader, "AttachedPos");
         }
 
-        private static void ProcessDynAttrs(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessDynAttrs(SceneObjectPart obj, XmlReader reader)
         {
             obj.DynAttrs.ReadXml(reader);
         }
 
-        private static void ProcessTextureAnimation(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessTextureAnimation(SceneObjectPart obj, XmlReader reader)
         {
             obj.TextureAnimation = Convert.FromBase64String(reader.ReadElementContentAsString("TextureAnimation", String.Empty));
         }
 
-        private static void ProcessParticleSystem(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessParticleSystem(SceneObjectPart obj, XmlReader reader)
         {
             obj.ParticleSystem = Convert.FromBase64String(reader.ReadElementContentAsString("ParticleSystem", String.Empty));
         }
 
-        private static void ProcessPayPrice0(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessPayPrice0(SceneObjectPart obj, XmlReader reader)
         {
             obj.PayPrice[0] = (int)reader.ReadElementContentAsInt("PayPrice0", String.Empty);
         }
 
-        private static void ProcessPayPrice1(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessPayPrice1(SceneObjectPart obj, XmlReader reader)
         {
             obj.PayPrice[1] = (int)reader.ReadElementContentAsInt("PayPrice1", String.Empty);
         }
 
-        private static void ProcessPayPrice2(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessPayPrice2(SceneObjectPart obj, XmlReader reader)
         {
             obj.PayPrice[2] = (int)reader.ReadElementContentAsInt("PayPrice2", String.Empty);
         }
 
-        private static void ProcessPayPrice3(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessPayPrice3(SceneObjectPart obj, XmlReader reader)
         {
             obj.PayPrice[3] = (int)reader.ReadElementContentAsInt("PayPrice3", String.Empty);
         }
 
-        private static void ProcessPayPrice4(SceneObjectPart obj, XmlTextReader reader)
+        private static void ProcessPayPrice4(SceneObjectPart obj, XmlReader reader)
         {
             obj.PayPrice[4] = (int)reader.ReadElementContentAsInt("PayPrice4", String.Empty);
         }
@@ -878,122 +880,122 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         #endregion
 
         #region TaskInventoryXmlProcessors
-        private static void ProcessTIAssetID(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIAssetID(TaskInventoryItem item, XmlReader reader)
         {
             item.AssetID = Util.ReadUUID(reader, "AssetID");
         }
 
-        private static void ProcessTIBasePermissions(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIBasePermissions(TaskInventoryItem item, XmlReader reader)
         {
             item.BasePermissions = (uint)reader.ReadElementContentAsInt("BasePermissions", String.Empty);
         }
 
-        private static void ProcessTICreationDate(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTICreationDate(TaskInventoryItem item, XmlReader reader)
         {
             item.CreationDate = (uint)reader.ReadElementContentAsInt("CreationDate", String.Empty);
         }
 
-        private static void ProcessTICreatorID(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTICreatorID(TaskInventoryItem item, XmlReader reader)
         {
             item.CreatorID = Util.ReadUUID(reader, "CreatorID");
         }
 
-        private static void ProcessTICreatorData(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTICreatorData(TaskInventoryItem item, XmlReader reader)
         {
             item.CreatorData = reader.ReadElementContentAsString("CreatorData", String.Empty);
         }
 
-        private static void ProcessTIDescription(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIDescription(TaskInventoryItem item, XmlReader reader)
         {
             item.Description = reader.ReadElementContentAsString("Description", String.Empty);
         }
 
-        private static void ProcessTIEveryonePermissions(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIEveryonePermissions(TaskInventoryItem item, XmlReader reader)
         {
             item.EveryonePermissions = (uint)reader.ReadElementContentAsInt("EveryonePermissions", String.Empty);
         }
 
-        private static void ProcessTIFlags(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIFlags(TaskInventoryItem item, XmlReader reader)
         {
             item.Flags = (uint)reader.ReadElementContentAsInt("Flags", String.Empty);
         }
 
-        private static void ProcessTIGroupID(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIGroupID(TaskInventoryItem item, XmlReader reader)
         {
             item.GroupID = Util.ReadUUID(reader, "GroupID");
         }
 
-        private static void ProcessTIGroupPermissions(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIGroupPermissions(TaskInventoryItem item, XmlReader reader)
         {
             item.GroupPermissions = (uint)reader.ReadElementContentAsInt("GroupPermissions", String.Empty);
         }
 
-        private static void ProcessTIInvType(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIInvType(TaskInventoryItem item, XmlReader reader)
         {
             item.InvType = reader.ReadElementContentAsInt("InvType", String.Empty);
         }
 
-        private static void ProcessTIItemID(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIItemID(TaskInventoryItem item, XmlReader reader)
         {
             item.ItemID = Util.ReadUUID(reader, "ItemID");
         }
 
-        private static void ProcessTIOldItemID(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIOldItemID(TaskInventoryItem item, XmlReader reader)
         {
             item.OldItemID = Util.ReadUUID(reader, "OldItemID");
         }
 
-        private static void ProcessTILastOwnerID(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTILastOwnerID(TaskInventoryItem item, XmlReader reader)
         {
             item.LastOwnerID = Util.ReadUUID(reader, "LastOwnerID");
         }
 
-        private static void ProcessTIName(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIName(TaskInventoryItem item, XmlReader reader)
         {
             item.Name = reader.ReadElementContentAsString("Name", String.Empty);
         }
 
-        private static void ProcessTINextPermissions(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTINextPermissions(TaskInventoryItem item, XmlReader reader)
         {
             item.NextPermissions = (uint)reader.ReadElementContentAsInt("NextPermissions", String.Empty);
         }
 
-        private static void ProcessTIOwnerID(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIOwnerID(TaskInventoryItem item, XmlReader reader)
         {
             item.OwnerID = Util.ReadUUID(reader, "OwnerID");
         }
 
-        private static void ProcessTICurrentPermissions(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTICurrentPermissions(TaskInventoryItem item, XmlReader reader)
         {
             item.CurrentPermissions = (uint)reader.ReadElementContentAsInt("CurrentPermissions", String.Empty);
         }
 
-        private static void ProcessTIParentID(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIParentID(TaskInventoryItem item, XmlReader reader)
         {
             item.ParentID = Util.ReadUUID(reader, "ParentID");
         }
 
-        private static void ProcessTIParentPartID(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIParentPartID(TaskInventoryItem item, XmlReader reader)
         {
             item.ParentPartID = Util.ReadUUID(reader, "ParentPartID");
         }
 
-        private static void ProcessTIPermsGranter(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIPermsGranter(TaskInventoryItem item, XmlReader reader)
         {
             item.PermsGranter = Util.ReadUUID(reader, "PermsGranter");
         }
 
-        private static void ProcessTIPermsMask(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIPermsMask(TaskInventoryItem item, XmlReader reader)
         {
             item.PermsMask = reader.ReadElementContentAsInt("PermsMask", String.Empty);
         }
 
-        private static void ProcessTIType(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIType(TaskInventoryItem item, XmlReader reader)
         {
             item.Type = reader.ReadElementContentAsInt("Type", String.Empty);
         }
 
-        private static void ProcessTIOwnerChanged(TaskInventoryItem item, XmlTextReader reader)
+        private static void ProcessTIOwnerChanged(TaskInventoryItem item, XmlReader reader)
         {
             item.OwnerChanged = Util.ReadBoolean(reader);
         }
@@ -1001,243 +1003,243 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         #endregion
 
         #region ShapeXmlProcessors
-        private static void ProcessShpProfileCurve(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpProfileCurve(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.ProfileCurve = (byte)reader.ReadElementContentAsInt("ProfileCurve", String.Empty);
         }
 
-        private static void ProcessShpTextureEntry(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpTextureEntry(PrimitiveBaseShape shp, XmlReader reader)
         {
             byte[] teData = Convert.FromBase64String(reader.ReadElementString("TextureEntry"));
             shp.Textures = new Primitive.TextureEntry(teData, 0, teData.Length);
         }
 
-        private static void ProcessShpExtraParams(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpExtraParams(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.ExtraParams = Convert.FromBase64String(reader.ReadElementString("ExtraParams"));
         }
 
-        private static void ProcessShpPathBegin(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathBegin(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathBegin = (ushort)reader.ReadElementContentAsInt("PathBegin", String.Empty);
         }
 
-        private static void ProcessShpPathCurve(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathCurve(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathCurve = (byte)reader.ReadElementContentAsInt("PathCurve", String.Empty);
         }
 
-        private static void ProcessShpPathEnd(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathEnd(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathEnd = (ushort)reader.ReadElementContentAsInt("PathEnd", String.Empty);
         }
 
-        private static void ProcessShpPathRadiusOffset(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathRadiusOffset(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathRadiusOffset = (sbyte)reader.ReadElementContentAsInt("PathRadiusOffset", String.Empty);
         }
 
-        private static void ProcessShpPathRevolutions(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathRevolutions(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathRevolutions = (byte)reader.ReadElementContentAsInt("PathRevolutions", String.Empty);
         }
 
-        private static void ProcessShpPathScaleX(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathScaleX(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathScaleX = (byte)reader.ReadElementContentAsInt("PathScaleX", String.Empty);
         }
 
-        private static void ProcessShpPathScaleY(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathScaleY(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathScaleY = (byte)reader.ReadElementContentAsInt("PathScaleY", String.Empty);
         }
 
-        private static void ProcessShpPathShearX(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathShearX(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathShearX = (byte)reader.ReadElementContentAsInt("PathShearX", String.Empty);
         }
 
-        private static void ProcessShpPathShearY(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathShearY(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathShearY = (byte)reader.ReadElementContentAsInt("PathShearY", String.Empty);
         }
 
-        private static void ProcessShpPathSkew(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathSkew(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathSkew = (sbyte)reader.ReadElementContentAsInt("PathSkew", String.Empty);
         }
 
-        private static void ProcessShpPathTaperX(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathTaperX(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathTaperX = (sbyte)reader.ReadElementContentAsInt("PathTaperX", String.Empty);
         }
 
-        private static void ProcessShpPathTaperY(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathTaperY(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathTaperY = (sbyte)reader.ReadElementContentAsInt("PathTaperY", String.Empty);
         }
 
-        private static void ProcessShpPathTwist(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathTwist(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathTwist = (sbyte)reader.ReadElementContentAsInt("PathTwist", String.Empty);
         }
 
-        private static void ProcessShpPathTwistBegin(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPathTwistBegin(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PathTwistBegin = (sbyte)reader.ReadElementContentAsInt("PathTwistBegin", String.Empty);
         }
 
-        private static void ProcessShpPCode(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpPCode(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.PCode = (byte)reader.ReadElementContentAsInt("PCode", String.Empty);
         }
 
-        private static void ProcessShpProfileBegin(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpProfileBegin(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.ProfileBegin = (ushort)reader.ReadElementContentAsInt("ProfileBegin", String.Empty);
         }
 
-        private static void ProcessShpProfileEnd(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpProfileEnd(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.ProfileEnd = (ushort)reader.ReadElementContentAsInt("ProfileEnd", String.Empty);
         }
 
-        private static void ProcessShpProfileHollow(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpProfileHollow(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.ProfileHollow = (ushort)reader.ReadElementContentAsInt("ProfileHollow", String.Empty);
         }
 
-        private static void ProcessShpScale(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpScale(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.Scale = Util.ReadVector(reader, "Scale");
         }
 
-        private static void ProcessShpState(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpState(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.State = (byte)reader.ReadElementContentAsInt("State", String.Empty);
         }
 
-        private static void ProcessShpLastAttach(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpLastAttach(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.LastAttachPoint = (byte)reader.ReadElementContentAsInt("LastAttachPoint", String.Empty);
         }
 
-        private static void ProcessShpProfileShape(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpProfileShape(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.ProfileShape = Util.ReadEnum<ProfileShape>(reader, "ProfileShape");
         }
 
-        private static void ProcessShpHollowShape(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpHollowShape(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.HollowShape = Util.ReadEnum<HollowShape>(reader, "HollowShape");
         }
         
-        private static void ProcessShpSculptTexture(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpSculptTexture(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.SculptTexture = Util.ReadUUID(reader, "SculptTexture");
         }
 
-        private static void ProcessShpSculptType(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpSculptType(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.SculptType = (byte)reader.ReadElementContentAsInt("SculptType", String.Empty);
         }
 
-        private static void ProcessShpFlexiSoftness(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpFlexiSoftness(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.FlexiSoftness = reader.ReadElementContentAsInt("FlexiSoftness", String.Empty);
         }
 
-        private static void ProcessShpFlexiTension(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpFlexiTension(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.FlexiTension = reader.ReadElementContentAsFloat("FlexiTension", String.Empty);
         }
 
-        private static void ProcessShpFlexiDrag(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpFlexiDrag(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.FlexiDrag = reader.ReadElementContentAsFloat("FlexiDrag", String.Empty);
         }
 
-        private static void ProcessShpFlexiGravity(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpFlexiGravity(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.FlexiGravity = reader.ReadElementContentAsFloat("FlexiGravity", String.Empty);
         }
 
-        private static void ProcessShpFlexiWind(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpFlexiWind(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.FlexiWind = reader.ReadElementContentAsFloat("FlexiWind", String.Empty);
         }
 
-        private static void ProcessShpFlexiForceX(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpFlexiForceX(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.FlexiForceX = reader.ReadElementContentAsFloat("FlexiForceX", String.Empty);
         }
 
-        private static void ProcessShpFlexiForceY(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpFlexiForceY(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.FlexiForceY = reader.ReadElementContentAsFloat("FlexiForceY", String.Empty);
         }
 
-        private static void ProcessShpFlexiForceZ(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpFlexiForceZ(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.FlexiForceZ = reader.ReadElementContentAsFloat("FlexiForceZ", String.Empty);
         }
 
-        private static void ProcessShpLightColorR(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpLightColorR(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.LightColorR = reader.ReadElementContentAsFloat("LightColorR", String.Empty);
         }
 
-        private static void ProcessShpLightColorG(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpLightColorG(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.LightColorG = reader.ReadElementContentAsFloat("LightColorG", String.Empty);
         }
 
-        private static void ProcessShpLightColorB(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpLightColorB(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.LightColorB = reader.ReadElementContentAsFloat("LightColorB", String.Empty);
         }
 
-        private static void ProcessShpLightColorA(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpLightColorA(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.LightColorA = reader.ReadElementContentAsFloat("LightColorA", String.Empty);
         }
 
-        private static void ProcessShpLightRadius(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpLightRadius(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.LightRadius = reader.ReadElementContentAsFloat("LightRadius", String.Empty);
         }
 
-        private static void ProcessShpLightCutoff(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpLightCutoff(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.LightCutoff = reader.ReadElementContentAsFloat("LightCutoff", String.Empty);
         }
 
-        private static void ProcessShpLightFalloff(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpLightFalloff(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.LightFalloff = reader.ReadElementContentAsFloat("LightFalloff", String.Empty);
         }
 
-        private static void ProcessShpLightIntensity(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpLightIntensity(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.LightIntensity = reader.ReadElementContentAsFloat("LightIntensity", String.Empty);
         }
 
-        private static void ProcessShpFlexiEntry(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpFlexiEntry(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.FlexiEntry = Util.ReadBoolean(reader);
         }
 
-        private static void ProcessShpLightEntry(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpLightEntry(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.LightEntry = Util.ReadBoolean(reader);
         }
 
-        private static void ProcessShpSculptEntry(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpSculptEntry(PrimitiveBaseShape shp, XmlReader reader)
         {
             shp.SculptEntry = Util.ReadBoolean(reader);
         }
 
-        private static void ProcessShpMedia(PrimitiveBaseShape shp, XmlTextReader reader)
+        private static void ProcessShpMedia(PrimitiveBaseShape shp, XmlReader reader)
         {
             string value = reader.ReadElementContentAsString("Media", String.Empty);
             shp.Media = PrimitiveBaseShape.MediaList.FromXml(value);
@@ -1589,7 +1591,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             }
         }
 
-        public static SceneObjectPart Xml2ToSOP(XmlTextReader reader)
+        public static SceneObjectPart Xml2ToSOP(XmlReader reader)
         {
             SceneObjectPart obj = new SceneObjectPart();
 
@@ -1610,7 +1612,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             return obj;
         }
 
-        public static TaskInventoryDictionary ReadTaskInventory(XmlTextReader reader, string name)
+        public static TaskInventoryDictionary ReadTaskInventory(XmlReader reader, string name)
         {
             TaskInventoryDictionary tinv = new TaskInventoryDictionary();
 
@@ -1651,7 +1653,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         /// <param name="name">The name of the xml element containing the shape</param>
         /// <param name="errors">a list containing the failing node names.  If no failures then null.</param>
         /// <returns>The shape parsed</returns>
-        public static PrimitiveBaseShape ReadShape(XmlTextReader reader, string name, out List<string> errorNodeNames)
+        public static PrimitiveBaseShape ReadShape(XmlReader reader, string name, out List<string> errorNodeNames)
         {
             List<string> internalErrorNodeNames = null;
 

OpenSim/Region/Framework/Scenes/Tests/SharedRegionModuleTests.cs

@@ -0,0 +1,249 @@
+/*
+ * 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.Net;
+using Mono.Addins;
+using Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim;
+using OpenSim.ApplicationPlugins.RegionModulesController;
+using OpenSim.Framework;
+using OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Tests.Common;
+
+namespace OpenSim.Region.Framework.Scenes.Tests
+{
+    public class SharedRegionModuleTests : OpenSimTestCase
+    {
+//        [Test]
+        public void TestLifecycle()
+        {
+            TestHelpers.InMethod();
+            TestHelpers.EnableLogging();
+
+            UUID estateOwnerId = TestHelpers.ParseTail(0x1);
+            UUID regionId = TestHelpers.ParseTail(0x10);
+
+            IConfigSource configSource = new IniConfigSource();
+            configSource.AddConfig("Startup");
+            configSource.AddConfig("Modules");
+
+//            // We use this to skip estate questions
+            // Turns out not to be needed is estate owner id is pre-set in region information.
+//            IConfig estateConfig = configSource.AddConfig(OpenSimBase.ESTATE_SECTION_NAME);
+//            estateConfig.Set("DefaultEstateOwnerName", "Zaphod Beeblebrox");
+//            estateConfig.Set("DefaultEstateOwnerUUID", estateOwnerId);
+//            estateConfig.Set("DefaultEstateOwnerEMail", "zaphod@galaxy.com");
+//            estateConfig.Set("DefaultEstateOwnerPassword", "two heads");
+
+            // For grid servic
+            configSource.AddConfig("GridService");
+            configSource.Configs["Modules"].Set("GridServices", "LocalGridServicesConnector");
+            configSource.Configs["GridService"].Set("StorageProvider", "OpenSim.Data.Null.dll:NullRegionData");
+            configSource.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Services.GridService.dll:GridService");
+            configSource.Configs["GridService"].Set("ConnectionString", "!static");
+
+            LocalGridServicesConnector gridService = new LocalGridServicesConnector();
+//
+            OpenSim sim = new OpenSim(configSource);
+
+            sim.SuppressExit = true;
+            sim.EnableInitialPluginLoad = false;
+            sim.LoadEstateDataService = false;
+            sim.NetServersInfo.HttpListenerPort = 0;
+
+            IRegistryCore reg = sim.ApplicationRegistry;
+
+            RegionInfo ri = new RegionInfo();
+            ri.RegionID = regionId;
+            ri.EstateSettings.EstateOwner = estateOwnerId;
+            ri.InternalEndPoint = new IPEndPoint(0, 0);
+
+            MockRegionModulesControllerPlugin rmcp = new MockRegionModulesControllerPlugin();
+            sim.m_plugins = new List<IApplicationPlugin>() { rmcp };
+            reg.RegisterInterface<IRegionModulesController>(rmcp);
+
+            // XXX: Have to initialize directly for now
+            rmcp.Initialise(sim);
+
+            rmcp.AddNode(gridService);
+
+            TestSharedRegion tsr = new TestSharedRegion();
+            rmcp.AddNode(tsr);
+
+            // FIXME: Want to use the real one eventually but this is currently directly tied into Mono.Addins
+            // which has been written in such a way that makes it impossible to use for regression tests.
+//            RegionModulesControllerPlugin rmcp = new RegionModulesControllerPlugin();
+//            rmcp.LoadModulesFromAddins = false;
+////            reg.RegisterInterface<IRegionModulesController>(rmcp);
+//            rmcp.Initialise(sim);
+//            rmcp.PostInitialise();           
+//            TypeExtensionNode node = new TypeExtensionNode();
+//            node.
+//            rmcp.AddNode(node, configSource.Configs["Modules"], new Dictionary<RuntimeAddin, IList<int>>());
+
+            sim.Startup();
+            IScene scene;
+            sim.CreateRegion(ri, out scene);
+
+            sim.Shutdown();
+
+            List<string> co = tsr.CallOrder;
+            int expectedEventCount = 6;
+
+            Assert.AreEqual(
+                expectedEventCount, 
+                co.Count, 
+                "Expected {0} events but only got {1} ({2})", 
+                expectedEventCount, co.Count, string.Join(",", co));
+            Assert.AreEqual("Initialise",       co[0]);
+            Assert.AreEqual("PostInitialise",   co[1]);
+            Assert.AreEqual("AddRegion",        co[2]);
+            Assert.AreEqual("RegionLoaded",     co[3]);
+            Assert.AreEqual("RemoveRegion",     co[4]);
+            Assert.AreEqual("Close",            co[5]);
+        }
+    }
+
+    class TestSharedRegion : ISharedRegionModule
+    {
+        // FIXME: Should really use MethodInfo
+        public List<string> CallOrder = new List<string>();
+                
+        public string Name { get { return "TestSharedRegion"; } }
+
+        public Type ReplaceableInterface { get { return null; } }
+
+        public void PostInitialise()
+        {
+            CallOrder.Add("PostInitialise");
+        }
+
+        public void Initialise(IConfigSource source)
+        {
+            CallOrder.Add("Initialise");
+        }
+
+        public void Close()
+        {
+            CallOrder.Add("Close");
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            CallOrder.Add("AddRegion");
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            CallOrder.Add("RemoveRegion");
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+            CallOrder.Add("RegionLoaded");
+        }
+    }
+
+    class MockRegionModulesControllerPlugin : IRegionModulesController, IApplicationPlugin
+    {
+        // List of shared module instances, for adding to Scenes
+        private List<ISharedRegionModule> m_sharedInstances = new List<ISharedRegionModule>();
+
+        // Config access
+        private OpenSimBase m_openSim;
+
+        public string Version { get { return "0"; } }
+        public string Name { get { return "MockRegionModulesControllerPlugin"; } }
+
+        public void Initialise() {}
+
+        public void Initialise(OpenSimBase sim) 
+        {
+            m_openSim = sim;
+        }
+
+        /// <summary>
+        /// Called when the application loading is completed 
+        /// </summary>
+        public void PostInitialise()
+        {
+            foreach (ISharedRegionModule module in m_sharedInstances)
+                module.PostInitialise();
+        }
+
+        public void AddRegionToModules(Scene scene)
+        {
+            List<ISharedRegionModule> sharedlist = new List<ISharedRegionModule>();
+
+            foreach (ISharedRegionModule module in m_sharedInstances)
+            {
+                module.AddRegion(scene);
+                scene.AddRegionModule(module.Name, module);
+
+                sharedlist.Add(module);
+            }
+
+            foreach (ISharedRegionModule module in sharedlist)
+            {
+                module.RegionLoaded(scene);
+            }
+        }
+
+        public void RemoveRegionFromModules(Scene scene)
+        {
+            foreach (IRegionModuleBase module in scene.RegionModules.Values)
+            {
+//                m_log.DebugFormat("[REGIONMODULE]: Removing scene {0} from module {1}",
+//                                  scene.RegionInfo.RegionName, module.Name);
+                module.RemoveRegion(scene);
+            }
+
+            scene.RegionModules.Clear();
+        }       
+        
+        public void AddNode(ISharedRegionModule module)
+        {
+            m_sharedInstances.Add(module);
+            module.Initialise(m_openSim.ConfigSource.Source);
+        }
+
+        public void Dispose()
+        {
+            // We expect that all regions have been removed already
+            while (m_sharedInstances.Count > 0)
+            {
+                m_sharedInstances[0].Close();
+                m_sharedInstances.RemoveAt(0);
+            }
+        }
+    }
+}

OpenSim/Region/Framework/Scenes/UuidGatherer.cs

@@ -458,9 +458,9 @@ namespace OpenSim.Region.Framework.Scenes
             if (null == assetBase)
                 return;
 
-            MemoryStream ms = new MemoryStream(assetBase.Data);
+            using (MemoryStream ms = new MemoryStream(assetBase.Data))
-            StreamReader sr = new StreamReader(ms);
+            using (StreamReader sr = new StreamReader(ms))
-
+            {
                 sr.ReadLine(); // Unknown (Version?)
                 sr.ReadLine(); // Unknown
                 sr.ReadLine(); // Unknown
@@ -486,7 +486,8 @@ namespace OpenSim.Region.Framework.Scenes
                     // If it can be parsed as a UUID, it is an asset ID
                     UUID uuid;
                     if (UUID.TryParse(id, out uuid))
-                    assetUuids[uuid] = (sbyte)AssetType.Animation;
+                        assetUuids[uuid] = (sbyte)AssetType.Animation;    // the asset is either an Animation or a Sound, but this distinction isn't important
+                }
             }
         }
 

OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs

@@ -487,7 +487,8 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
             report.Append(GetColumnEntry("Type", maxTypeLength, columnPadding));            
             
             report.AppendFormat(
-                "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}\n",
+                "{0,8} {1,7} {2,8} {3,7} {4,7} {5,7} {6,7} {7,9} {8,7}\n",
+                "Max",
                 "Total",
                 "Resend",
                 "Land",
@@ -499,7 +500,8 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
     
             report.AppendFormat("{0,-" + totalInfoFieldsLength +  "}", "");
             report.AppendFormat(
-                "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}",
+                "{0,8} {1,7} {2,8} {3,7} {4,7} {5,7} {6,7} {7,9} {8,7}\n",
+                "kb/s",
                 "kb/s",
                 "kb/s",
                 "kb/s",
@@ -548,7 +550,8 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                                 report.Append(GetColumnEntry(isChild ? "Cd" : "Rt", maxTypeLength, columnPadding));                                                             
                             
                                 report.AppendFormat(
-                                    "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}",
+                                    "{0,8} {1,7} {2,8} {3,7} {4,7} {5,7} {6,7} {7,9} {8,7}",
+                                    (ci.maxThrottle * 8) / 1000,
                                     (ci.totalThrottle * 8) / 1000,
                                     (ci.resendThrottle * 8) / 1000,
                                     (ci.landThrottle * 8) / 1000,
@@ -584,7 +587,8 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
             
             ThrottleRates throttleRates = udpServer.ThrottleRates;
             report.AppendFormat(
-                "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}",
+                "{0,8} {1,7} {2,8} {3,7} {4,7} {5,7} {6,7} {7,9} {8,7}",
+                "-",
                 (throttleRates.Total * 8) / 1000,
                 (throttleRates.Resend * 8) / 1000,
                 (throttleRates.Land * 8) / 1000,