Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

Resolve merge conflicts

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs

2 files changed, 38 insertions, 27 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 8556105..1f4d022 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3164,7 +3164,6 @@ namespace OpenSim.Region.Framework.Scenes
                 }
 
                 m_authenticateHandler.RemoveCircuit(avatar.ControllingClient.CircuitCode);
-
                 //m_log.InfoFormat("[SCENE] Memory pre  GC {0}", System.GC.GetTotalMemory(false));
                 //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true));
             }
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 2b24706..1da4287 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -95,7 +95,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         protected internal Dictionary<uint, SceneObjectGroup> SceneObjectGroupsByLocalID = new Dictionary<uint, SceneObjectGroup>();
         protected internal Dictionary<UUID, SceneObjectGroup> SceneObjectGroupsByFullID = new Dictionary<UUID, SceneObjectGroup>();
-        private readonly Object m_dictionary_lock = new Object();
 
         private Object m_updateLock = new Object();
 
@@ -136,11 +135,10 @@ namespace OpenSim.Region.Framework.Scenes
                 m_scenePresenceArray = newlist;
             }
 
-            lock (m_dictionary_lock)
-            {
+            lock (SceneObjectGroupsByFullID)
                 SceneObjectGroupsByFullID.Clear();
+            lock (SceneObjectGroupsByLocalID)
                 SceneObjectGroupsByLocalID.Clear();
-            }
 
             Entities.Clear();
         }
@@ -384,10 +382,10 @@ namespace OpenSim.Region.Framework.Scenes
                     }
         
                     sceneObject.AttachToScene(m_parentScene);
-        
+
                     if (sendClientUpdates)
                         sceneObject.ScheduleGroupForFullUpdate();
-                                         
+                                     
                     Entities.Add(sceneObject);
                     m_numPrim += sceneObject.Children.Count;
     
@@ -397,15 +395,18 @@ namespace OpenSim.Region.Framework.Scenes
                     if (OnObjectCreate != null)
                         OnObjectCreate(sceneObject);
                     
-                    lock (m_dictionary_lock)
+                    lock (SceneObjectGroupsByFullID)
                     {
                         SceneObjectGroupsByFullID[sceneObject.UUID] = sceneObject;
-                        SceneObjectGroupsByLocalID[sceneObject.LocalId] = sceneObject;
                         foreach (SceneObjectPart part in sceneObject.Children.Values)
-                        {
                             SceneObjectGroupsByFullID[part.UUID] = sceneObject;
+                    }
+                        
+                    lock (SceneObjectGroupsByLocalID)
+                    {
+                        SceneObjectGroupsByLocalID[sceneObject.LocalId] = sceneObject;
+                        foreach (SceneObjectPart part in sceneObject.Children.Values)
                             SceneObjectGroupsByLocalID[part.LocalId] = sceneObject;
-                        }
                     }
                 }
             }
@@ -421,29 +422,32 @@ namespace OpenSim.Region.Framework.Scenes
         {
             if (Entities.ContainsKey(uuid))
             {
+                SceneObjectGroup grp = (SceneObjectGroup)Entities[uuid];
+
                 if (!resultOfObjectLinked)
                 {
-                    SceneObjectGroup sog = Entities[uuid] as SceneObjectGroup;
-                    
-                    lock (sog.Children)
-                    {
-                        m_numPrim -= sog.PrimCount;
-    
-                        if ((((SceneObjectGroup)Entities[uuid]).RootPart.Flags & PrimFlags.Physics) == PrimFlags.Physics)
-                        {
-                            RemovePhysicalPrim(sog.PrimCount);
-                        }
-                    }
+                    m_numPrim -= grp.PrimCount;
+
+                    if ((grp.RootPart.Flags & PrimFlags.Physics) == PrimFlags.Physics)
+                        RemovePhysicalPrim(grp.PrimCount);
                 }
 
                 if (OnObjectRemove != null)
                     OnObjectRemove(Entities[uuid]);
 
-                lock (m_dictionary_lock)
+                lock (SceneObjectGroupsByFullID)
                 {
-                    SceneObjectGroupsByFullID.Remove(uuid);
-                    SceneObjectGroupsByLocalID.Remove(((SceneObjectGroup)Entities[uuid]).LocalId);
+                    foreach (SceneObjectPart part in grp.Children.Values)
+                        SceneObjectGroupsByFullID.Remove(part.UUID);
+                    SceneObjectGroupsByFullID.Remove(grp.RootPart.UUID);
                 }
+                lock (SceneObjectGroupsByLocalID)
+                {
+                    foreach (SceneObjectPart part in grp.Children.Values)
+                        SceneObjectGroupsByLocalID.Remove(part.LocalId);
+                    SceneObjectGroupsByLocalID.Remove(grp.RootPart.LocalId);
+                }
+
                 Entities.Remove(uuid);
                 //SceneObjectGroup part;
                 //((part.RootPart.Flags & PrimFlags.Physics) == PrimFlags.Physics)
@@ -868,7 +872,9 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (SceneObjectGroupsByLocalID.TryGetValue(localID, out sog))
                 {
-                    return sog;
+                    if (sog.HasChildPrim(localID))
+                        return sog;
+                    SceneObjectGroupsByLocalID.Remove(localID);
                 }
             }
 
@@ -904,7 +910,13 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (SceneObjectGroupsByFullID.TryGetValue(fullID, out sog))
                 {
-                    return sog;
+                    lock (sog.Children)
+                    {
+                        if (sog.Children.ContainsKey(fullID))
+                            return sog;
+                    }
+                    
+                    SceneObjectGroupsByFullID.Remove(fullID);
                 }
             }