Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmerge

1 files changed, 67 insertions, 67 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 925a4f3..9e04aa1 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -243,11 +243,6 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-
-        // neighbouring regions we have enabled a child agent in
-        // holds the seed cap for the child agent in that region
-        private Dictionary<ulong, string> m_knownChildRegions = new Dictionary<ulong, string>();
-
         /// <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.
@@ -699,29 +694,6 @@ namespace OpenSim.Region.Framework.Scenes
             set { m_health = value; }
         }
 
-        /// <summary>
-        /// These are the region handles known by the avatar.
-        /// </summary>
-        public List<ulong> KnownChildRegionHandles
-        {
-            get 
-            {
-                if (m_knownChildRegions.Count == 0) 
-                    return new List<ulong>();
-                else
-                    return new List<ulong>(m_knownChildRegions.Keys); 
-            }
-        }
-
-        public Dictionary<ulong, string> KnownRegions
-        {
-            get { return m_knownChildRegions; }
-            set 
-            {
-                m_knownChildRegions = value; 
-            }
-        }
-
         private ISceneViewer m_sceneViewer;
 
         public ISceneViewer SceneViewer
@@ -1253,7 +1225,11 @@ namespace OpenSim.Region.Framework.Scenes
         public void StopFlying()
         {
             ControllingClient.StopFlying(this);
-        }
+        }

+

+        // neighbouring regions we have enabled a child agent in

+        // holds the seed cap for the child agent in that region

+        private Dictionary<ulong, string> m_knownChildRegions = new Dictionary<ulong, string>();
 
         public void AddNeighbourRegion(ulong regionHandle, string cap)
         {
@@ -1269,14 +1245,14 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         public void RemoveNeighbourRegion(ulong regionHandle)
-        {
+        {

             lock (m_knownChildRegions)
             {
-                if (m_knownChildRegions.ContainsKey(regionHandle))
-                {
-                    m_knownChildRegions.Remove(regionHandle);
-                   //m_log.Debug(" !!! removing known region {0} in {1}. Count = {2}", regionHandle, Scene.RegionInfo.RegionName, m_knownChildRegions.Count);
-                }
+                // Checking ContainsKey is redundant as Remove works either way and returns a bool
+                // This is here to allow the Debug output to be conditional on removal

+                //if (m_knownChildRegions.ContainsKey(regionHandle))

+                //    m_log.DebugFormat(" !!! removing known region {0} in {1}. Count = {2}", regionHandle, Scene.RegionInfo.RegionName, m_knownChildRegions.Count);
+                m_knownChildRegions.Remove(regionHandle);
             }
         }
 
@@ -1287,11 +1263,39 @@ namespace OpenSim.Region.Framework.Scenes
                 RemoveNeighbourRegion(handle);
                 Scene.CapsModule.DropChildSeed(UUID, handle);
             }
-        }
-
-        public List<ulong> GetKnownRegionList()
-        {
-            return new List<ulong>(m_knownChildRegions.Keys);
+        }

+

+        public Dictionary<ulong, string> KnownRegions

+        {

+            get

+            {

+                lock (m_knownChildRegions)

+                    return new Dictionary<ulong, string>(m_knownChildRegions);

+            }

+            set

+            {

+                // Replacing the reference is atomic but we still need to lock on

+                // the original dictionary object which may be in use elsewhere

+                lock (m_knownChildRegions)

+                    m_knownChildRegions = value;

+            }

+        }

+

+        public List<ulong> KnownRegionHandles

+        {

+            get

+            {

+                return new List<ulong>(KnownRegions.Keys);

+            }

+        }

+

+        public int KnownRegionCount

+        {

+            get

+            {

+                lock (m_knownChildRegions)

+                    return m_knownChildRegions.Count;

+            }

         }
 
         #endregion
@@ -3082,7 +3086,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 // Throttles 
                 float multiplier = 1;
-                int childRegions = m_knownChildRegions.Count;
+                int childRegions = KnownRegionCount;
                 if (childRegions != 0)
                     multiplier = 1f / childRegions;
 
@@ -3334,30 +3338,28 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns></returns>
         public void CloseChildAgents(uint newRegionX, uint newRegionY)
         {
-            List<ulong> byebyeRegions = new List<ulong>();
+            List<ulong> byebyeRegions = new List<ulong>();

+            List<ulong> knownRegions = KnownRegionHandles;
             m_log.DebugFormat(
                 "[SCENE PRESENCE]: Closing child agents. Checking {0} regions in {1}", 
-                m_knownChildRegions.Keys.Count, Scene.RegionInfo.RegionName);
-            //DumpKnownRegions();
-
-            lock (m_knownChildRegions)
+                knownRegions.Count, Scene.RegionInfo.RegionName);
+            //DumpKnownRegions();

+

+            foreach (ulong handle in knownRegions)
             {
-                foreach (ulong handle in m_knownChildRegions.Keys)
+                // Don't close the agent on this region yet
+                if (handle != Scene.RegionInfo.RegionHandle)
                 {
-                    // Don't close the agent on this region yet
-                    if (handle != Scene.RegionInfo.RegionHandle)
+                    uint x, y;
+                    Utils.LongToUInts(handle, out x, out y);
+                    x = x / Constants.RegionSize;
+                    y = y / Constants.RegionSize;
+
+                    //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))
                     {
-                        uint x, y;
-                        Utils.LongToUInts(handle, out x, out y);
-                        x = x / Constants.RegionSize;
-                        y = y / Constants.RegionSize;
-
-                        //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))
-                        {
-                            byebyeRegions.Add(handle);
-                        }
+                        byebyeRegions.Add(handle);
                     }
                 }
             }
@@ -3475,7 +3477,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             // Throttles 
             float multiplier = 1;
-            int childRegions = m_knownChildRegions.Count;
+            int childRegions = KnownRegionCount;
             if (childRegions != 0)
                 multiplier = 1f / childRegions;
 
@@ -3939,12 +3941,10 @@ namespace OpenSim.Region.Framework.Scenes
         public void Close()
         {
             if (!IsChildAgent)
-                m_scene.AttachmentsModule.DeleteAttachmentsFromScene(this, false);
-            
-            lock (m_knownChildRegions)
-            {
-                m_knownChildRegions.Clear();
-            }
+                m_scene.AttachmentsModule.DeleteAttachmentsFromScene(this, false);

+

+            // Clear known regions

+            KnownRegions = new Dictionary<ulong, string>();

 
             lock (m_reprioritization_timer)
             {