Revert "Merging in diva's locking fixes"

This reverts commit 832cc685138b2244529f10b54b373c34adb4a633.

1 files changed, 13 insertions, 23 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 20b3b5c..54ac792 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -297,44 +297,34 @@ namespace OpenSim.Region.Framework.Scenes
 
             sceneObject.AttachToScene(m_parentScene);
 
-            List<SceneObjectPart> parts = null;
-            bool found = false;
             lock (sceneObject)
             {
                 if (!Entities.ContainsKey(sceneObject.UUID))
                 {
-                    found = true;
                     Entities.Add(sceneObject);
                     m_numPrim += sceneObject.Children.Count;
 
                     if (attachToBackup)
                         sceneObject.AttachToBackup();
 
-                    parts = new List<SceneObjectPart>(sceneObject.Children.Values);
-
-                }
-            }
-
-            if (found)
-            {
-                lock (m_dictionary_lock)
-                {
-                    SceneObjectGroupsByFullID[sceneObject.UUID] = sceneObject;
-                    SceneObjectGroupsByLocalID[sceneObject.LocalId] = sceneObject;
-                    foreach (SceneObjectPart part in parts)
+                    if (OnObjectCreate != null)
+                        OnObjectCreate(sceneObject);
+                    
+                    lock (m_dictionary_lock)
                     {
-                        SceneObjectGroupsByFullID[part.UUID] = sceneObject;
-                        SceneObjectGroupsByLocalID[part.LocalId] = sceneObject;
+                        SceneObjectGroupsByFullID[sceneObject.UUID] = sceneObject;
+                        SceneObjectGroupsByLocalID[sceneObject.LocalId] = sceneObject;
+                        foreach (SceneObjectPart part in sceneObject.Children.Values)
+                        {
+                            SceneObjectGroupsByFullID[part.UUID] = sceneObject;
+                            SceneObjectGroupsByLocalID[part.LocalId] = sceneObject;
+                        }
                     }
-                }
 
-                if (OnObjectCreate != null)
-                    OnObjectCreate(sceneObject);
-
-                return true;
+                    return true;
+                }
             }
 
-
             return false;
         }