Merge branch 'master' into careminster-presence-refactor

1 files changed, 48 insertions, 45 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 3c2203c..d4658ec 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -307,61 +307,64 @@ namespace OpenSim.Region.Framework.Scenes
             if (sceneObject == null || sceneObject.RootPart == null || sceneObject.RootPart.UUID == UUID.Zero)
                 return false;
 
-            bool alreadyExisted = false;
-            
-            if (m_parentScene.m_clampPrimSize)
-            {
-                foreach (SceneObjectPart part in sceneObject.Children.Values)
+            lock (sceneObject)
+            {            
+                if (Entities.ContainsKey(sceneObject.UUID))
                 {
-                    Vector3 scale = part.Shape.Scale;
-
-                    if (scale.X > m_parentScene.m_maxNonphys)
-                        scale.X = m_parentScene.m_maxNonphys;
-                    if (scale.Y > m_parentScene.m_maxNonphys)
-                        scale.Y = m_parentScene.m_maxNonphys;
-                    if (scale.Z > m_parentScene.m_maxNonphys)
-                        scale.Z = m_parentScene.m_maxNonphys;
-
-                    part.Shape.Scale = scale;
+//                    m_log.WarnFormat(
+//                        "[SCENE GRAPH]: Scene object {0} {1} was already in region {2} on add request", 
+//                        sceneObject.Name, sceneObject.UUID, m_parentScene.RegionInfo.RegionName);                    
+                    return false;
                 }
-            }
-
-            sceneObject.AttachToScene(m_parentScene);
-
-            if (sendClientUpdates)
-                sceneObject.ScheduleGroupForFullUpdate();
-
-            lock (sceneObject)
-            {
-                if (!Entities.ContainsKey(sceneObject.UUID))
+                   
+//                    m_log.DebugFormat(
+//                        "[SCENE GRAPH]: Adding object {0} {1} to region {2}", 
+//                        sceneObject.Name, sceneObject.UUID, m_parentScene.RegionInfo.RegionName);                
+            
+                if (m_parentScene.m_clampPrimSize)
                 {
-                    Entities.Add(sceneObject);
-                    m_numPrim += sceneObject.Children.Count;
-
-                    if (attachToBackup)
-                        sceneObject.AttachToBackup();
-
-                    if (OnObjectCreate != null)
-                        OnObjectCreate(sceneObject);
-                    
-                    lock (m_dictionary_lock)
+                    foreach (SceneObjectPart part in sceneObject.Children.Values)
                     {
-                        SceneObjectGroupsByFullID[sceneObject.UUID] = sceneObject;
-                        SceneObjectGroupsByLocalID[sceneObject.LocalId] = sceneObject;
-                        foreach (SceneObjectPart part in sceneObject.Children.Values)
-                        {
-                            SceneObjectGroupsByFullID[part.UUID] = sceneObject;
-                            SceneObjectGroupsByLocalID[part.LocalId] = sceneObject;
-                        }
+                        Vector3 scale = part.Shape.Scale;
+    
+                        if (scale.X > m_parentScene.m_maxNonphys)
+                            scale.X = m_parentScene.m_maxNonphys;
+                        if (scale.Y > m_parentScene.m_maxNonphys)
+                            scale.Y = m_parentScene.m_maxNonphys;
+                        if (scale.Z > m_parentScene.m_maxNonphys)
+                            scale.Z = m_parentScene.m_maxNonphys;
+    
+                        part.Shape.Scale = scale;
                     }
                 }
-                else
+    
+                sceneObject.AttachToScene(m_parentScene);
+    
+                if (sendClientUpdates)
+                    sceneObject.ScheduleGroupForFullUpdate();
+                                     
+                Entities.Add(sceneObject);
+                m_numPrim += sceneObject.Children.Count;
+
+                if (attachToBackup)
+                    sceneObject.AttachToBackup();
+
+                if (OnObjectCreate != null)
+                    OnObjectCreate(sceneObject);
+                
+                lock (m_dictionary_lock)
                 {
-                    alreadyExisted = true;
+                    SceneObjectGroupsByFullID[sceneObject.UUID] = sceneObject;
+                    SceneObjectGroupsByLocalID[sceneObject.LocalId] = sceneObject;
+                    foreach (SceneObjectPart part in sceneObject.Children.Values)
+                    {
+                        SceneObjectGroupsByFullID[part.UUID] = sceneObject;
+                        SceneObjectGroupsByLocalID[part.LocalId] = sceneObject;
+                    }
                 }
             }
 
-            return alreadyExisted;
+            return true;
         }
 
         /// <summary>