Merge branch 'master' into careminster-presence-refactor

The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.

1 files changed, 148 insertions, 159 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index a39f27a..6246400 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -81,10 +81,7 @@ namespace OpenSim.Region.Framework.Scenes
         protected Dictionary<UUID, ScenePresence> m_scenePresenceMap = new Dictionary<UUID, ScenePresence>();
         protected List<ScenePresence> m_scenePresenceArray = new List<ScenePresence>();
 
-        // SceneObjects is not currently populated or used.
-        //public Dictionary<UUID, SceneObjectGroup> SceneObjects;
         protected internal EntityManager Entities = new EntityManager();
-//        protected internal Dictionary<UUID, EntityBase> Entities = new Dictionary<UUID, EntityBase>();
         protected internal Dictionary<UUID, ScenePresence> RestorePresences = new Dictionary<UUID, ScenePresence>();
 
         protected RegionInfo m_regInfo;
@@ -323,7 +320,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="pos">Position of the object</param>
         /// <param name="rot">Rotation of the object</param>
         /// <param name="vel">Velocity of the object.  This parameter only has an effect if the object is physical</param>
-        /// <returns></returns>        
+        /// <returns></returns>
         public bool AddNewSceneObject(
             SceneObjectGroup sceneObject, bool attachToBackup, Vector3 pos, Quaternion rot, Vector3 vel)
         {
@@ -347,7 +344,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
         
             return true;
-        }        
+        }
 
         /// <summary>
         /// Add an object to the scene.  This will both update the scene, and send information about the
@@ -370,68 +367,57 @@ namespace OpenSim.Region.Framework.Scenes
             if (sceneObject == null || sceneObject.RootPart == null || sceneObject.RootPart.UUID == UUID.Zero)
                 return false;
 
-            lock (sceneObject)
-            {            
-                if (Entities.ContainsKey(sceneObject.UUID))
-                {
-//                    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;
-                }
-                   
-//                    m_log.DebugFormat(
-//                        "[SCENE GRAPH]: Adding object {0} {1} to region {2}", 
-//                        sceneObject.Name, sceneObject.UUID, m_parentScene.RegionInfo.RegionName);                
-            
-                lock (sceneObject.Children)
+            if (Entities.ContainsKey(sceneObject.UUID))
+                return false;
+
+            List<SceneObjectPart> children;
+            lock (sceneObject.Children)
+                children = new List<SceneObjectPart>(sceneObject.Children.Values);
+
+            // Clamp child prim sizes and add child prims to the m_numPrim count
+            if (m_parentScene.m_clampPrimSize)
+            {
+                foreach (SceneObjectPart part in children)
                 {
-                    if (m_parentScene.m_clampPrimSize)
-                    {
-                        foreach (SceneObjectPart part in sceneObject.Children.Values)
-                        {
-                            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_numPrim += sceneObject.Children.Count;
+                    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;
                 }
-        
-                sceneObject.AttachToScene(m_parentScene);
+            }
+            m_numPrim += children.Count;
 
-                if (sendClientUpdates)
-                    sceneObject.ScheduleGroupForFullUpdate();
-                                 
-                Entities.Add(sceneObject);                    
+            sceneObject.AttachToScene(m_parentScene);
 
-                if (attachToBackup)
-                    sceneObject.AttachToBackup();
+            if (sendClientUpdates)
+                sceneObject.ScheduleGroupForFullUpdate();
 
-                if (OnObjectCreate != null)
-                    OnObjectCreate(sceneObject);
-                
-                lock (SceneObjectGroupsByFullID)
-                {
-                    SceneObjectGroupsByFullID[sceneObject.UUID] = 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;
-                }
+            Entities.Add(sceneObject);
+
+            if (attachToBackup)
+                sceneObject.AttachToBackup();
+
+            if (OnObjectCreate != null)
+                OnObjectCreate(sceneObject);
+
+            lock (SceneObjectGroupsByFullID)
+            {
+                SceneObjectGroupsByFullID[sceneObject.UUID] = sceneObject;
+                foreach (SceneObjectPart part in children)
+                    SceneObjectGroupsByFullID[part.UUID] = sceneObject;
+            }
+
+            lock (SceneObjectGroupsByLocalID)
+            {
+                SceneObjectGroupsByLocalID[sceneObject.LocalId] = sceneObject;
+                foreach (SceneObjectPart part in children)
+                    SceneObjectGroupsByLocalID[part.LocalId] = sceneObject;
             }
 
             return true;
@@ -443,42 +429,38 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns>true if the object was deleted, false if there was no object to delete</returns>
         public bool DeleteSceneObject(UUID uuid, bool resultOfObjectLinked)
         {
-            if (Entities.ContainsKey(uuid))
-            {
-                SceneObjectGroup grp = (SceneObjectGroup)Entities[uuid];
+            EntityBase entity;
+            if (!Entities.TryGetValue(uuid, out entity) && entity is SceneObjectGroup)
+                return false;
 
-                if (!resultOfObjectLinked)
-                {
-                    m_numPrim -= grp.PrimCount;
+            SceneObjectGroup grp = (SceneObjectGroup)entity;
 
-                    if ((grp.RootPart.Flags & PrimFlags.Physics) == PrimFlags.Physics)
-                        RemovePhysicalPrim(grp.PrimCount);
-                }
+            if (!resultOfObjectLinked)
+            {
+                m_numPrim -= grp.PrimCount;
 
-                if (OnObjectRemove != null)
-                    OnObjectRemove(Entities[uuid]);
+                if ((grp.RootPart.Flags & PrimFlags.Physics) == PrimFlags.Physics)
+                    RemovePhysicalPrim(grp.PrimCount);
+            }
 
-                lock (SceneObjectGroupsByFullID)
-                {
-                    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);
-                }
+            if (OnObjectRemove != null)
+                OnObjectRemove(Entities[uuid]);
 
-                Entities.Remove(uuid);
-                //SceneObjectGroup part;
-                //((part.RootPart.Flags & PrimFlags.Physics) == PrimFlags.Physics)
+            lock (SceneObjectGroupsByFullID)
+            {
+                foreach (SceneObjectPart part in grp.Children.Values)
+                    SceneObjectGroupsByFullID.Remove(part.UUID);
+                SceneObjectGroupsByFullID.Remove(grp.RootPart.UUID);
+            }
 
-                return true;
+            lock (SceneObjectGroupsByLocalID)
+            {
+                foreach (SceneObjectPart part in grp.Children.Values)
+                    SceneObjectGroupsByLocalID.Remove(part.LocalId);
+                SceneObjectGroupsByLocalID.Remove(grp.RootPart.LocalId);
             }
 
-            return false;
+            return Entities.Remove(uuid);
         }
 
         /// <summary>
@@ -490,9 +472,7 @@ namespace OpenSim.Region.Framework.Scenes
         protected internal void AddToUpdateList(SceneObjectGroup obj)
         {
             lock (m_updateList)
-            {
                 m_updateList[obj.UUID] = obj;
-            }
         }
 
         public void FireAttachToBackup(SceneObjectGroup obj)
@@ -526,34 +506,39 @@ namespace OpenSim.Region.Framework.Scenes
         {
             if (!Monitor.TryEnter(m_updateLock))
                 return;
-
-            List<SceneObjectGroup> updates;
-
-            // Some updates add more updates to the updateList. 
-            // Get the current list of updates and clear the list before iterating
-            lock (m_updateList)
-            {
-                updates = new List<SceneObjectGroup>(m_updateList.Values);
-                m_updateList.Clear();
-            }
-
-            // Go through all updates
-            for (int i = 0; i < updates.Count; i++)
+            try
             {
-                SceneObjectGroup sog = updates[i];
+                List<SceneObjectGroup> updates;
 
-                // Don't abort the whole update if one entity happens to give us an exception.
-                try
+                // Some updates add more updates to the updateList. 
+                // Get the current list of updates and clear the list before iterating
+                lock (m_updateList)
                 {
-                    sog.Update();
+                    updates = new List<SceneObjectGroup>(m_updateList.Values);
+                    m_updateList.Clear();
                 }
-                catch (Exception e)
+
+                // Go through all updates
+                for (int i = 0; i < updates.Count; i++)
                 {
-                    m_log.ErrorFormat(
-                        "[INNER SCENE]: Failed to update {0}, {1} - {2}", sog.Name, sog.UUID, e);
+                    SceneObjectGroup sog = updates[i];
+
+                    // Don't abort the whole update if one entity happens to give us an exception.
+                    try
+                    {
+                        sog.Update();
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                            "[INNER SCENE]: Failed to update {0}, {1} - {2}", sog.Name, sog.UUID, e);
+                    }
                 }
             }
-            Monitor.Exit(m_updateLock);
+            finally
+            {
+                Monitor.Exit(m_updateLock);
+            }
         }
 
         protected internal void AddPhysicalPrim(int number)
@@ -920,38 +905,38 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns>null if no scene object group containing that prim is found</returns>
         public SceneObjectGroup GetGroupByPrim(uint localID)
         {
-            if (Entities.ContainsKey(localID))
-                return Entities[localID] as SceneObjectGroup;
+            EntityBase entity;
+            if (Entities.TryGetValue(localID, out entity))
+                return entity as SceneObjectGroup;
 
             //m_log.DebugFormat("Entered GetGroupByPrim with localID {0}", localID);
             SceneObjectGroup sog;
             lock (SceneObjectGroupsByLocalID)
+                SceneObjectGroupsByLocalID.TryGetValue(localID, out sog);
+
+            if (sog != null)
             {
-                if (SceneObjectGroupsByLocalID.TryGetValue(localID, out sog))
-                {
-                    if (sog.HasChildPrim(localID))
-                        return sog;
-                    SceneObjectGroupsByLocalID.Remove(localID);
-                }
+                if (sog.HasChildPrim(localID))
+                    return sog;
+                SceneObjectGroupsByLocalID.Remove(localID);
             }
 
-            List<EntityBase> EntityList = GetEntities();
-            foreach (EntityBase ent in EntityList)
+            EntityBase[] entityList = GetEntities();
+            foreach (EntityBase ent in entityList)
             {
                 //m_log.DebugFormat("Looking at entity {0}", ent.UUID);
                 if (ent is SceneObjectGroup)
                 {
-                    if (((SceneObjectGroup)ent).HasChildPrim(localID))
+                    sog = (SceneObjectGroup)ent;
+                    if (sog.HasChildPrim(localID))
                     {
-                        sog = (SceneObjectGroup)ent;
                         lock (SceneObjectGroupsByLocalID)
-                        {
                             SceneObjectGroupsByLocalID[localID] = sog;
-                        }
                         return sog;
                     }
                 }
             }
+
             return null;
         }
 
@@ -964,36 +949,35 @@ namespace OpenSim.Region.Framework.Scenes
         {
             SceneObjectGroup sog;
             lock (SceneObjectGroupsByFullID)
+                SceneObjectGroupsByFullID.TryGetValue(fullID, out sog);
+
+            if (sog != null)
             {
-                if (SceneObjectGroupsByFullID.TryGetValue(fullID, out sog))
+                lock (sog.Children)
                 {
-                    lock (sog.Children)
-                    {
-                        if (sog.Children.ContainsKey(fullID))
-                            return sog;
-                    }
-                    
-                    SceneObjectGroupsByFullID.Remove(fullID);
+                    if (sog.Children.ContainsKey(fullID))
+                        return sog;
                 }
-            }
 
-            List<EntityBase> EntityList = GetEntities();
+                lock (SceneObjectGroupsByFullID)
+                    SceneObjectGroupsByFullID.Remove(fullID);
+            }
 
-            foreach (EntityBase ent in EntityList)
+            EntityBase[] entityList = GetEntities();
+            foreach (EntityBase ent in entityList)
             {
                 if (ent is SceneObjectGroup)
                 {
-                    if (((SceneObjectGroup)ent).HasChildPrim(fullID))
+                    sog = (SceneObjectGroup)ent;
+                    if (sog.HasChildPrim(fullID))
                     {
-                        sog = (SceneObjectGroup)ent;
                         lock (SceneObjectGroupsByFullID)
-                        {
                             SceneObjectGroupsByFullID[fullID] = sog;
-                        }
                         return sog;
                     }
                 }
             }
+
             return null;
         }
 
@@ -1002,7 +986,7 @@ namespace OpenSim.Region.Framework.Scenes
             // Primitive Ray Tracing
             float closestDistance = 280f;
             EntityIntersection result = new EntityIntersection();
-            List<EntityBase> EntityList = GetEntities();
+            EntityBase[] EntityList = GetEntities();
             foreach (EntityBase ent in EntityList)
             {
                 if (ent is SceneObjectGroup)
@@ -1040,23 +1024,28 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns>null if the part was not found</returns>
         protected internal SceneObjectPart GetSceneObjectPart(string name)
         {
-            List<EntityBase> EntityList = GetEntities();
+            SceneObjectPart sop = null;
 
-            // FIXME: use a dictionary here
-            foreach (EntityBase ent in EntityList)
-            {
-                if (ent is SceneObjectGroup)
+            Entities.Find(
+                delegate(EntityBase entity)
                 {
-                    foreach (SceneObjectPart p in ((SceneObjectGroup) ent).GetParts())
+                    if (entity is SceneObjectGroup)
                     {
-                        if (p.Name == name)
+                        foreach (SceneObjectPart p in ((SceneObjectGroup)entity).GetParts())
                         {
-                            return p;
+                            if (p.Name == name)
+                            {
+                                sop = p;
+                                return true;
+                            }
                         }
                     }
+
+                    return false;
                 }
-            }
-            return null;
+            );
+
+            return sop;
         }
 
         /// <summary>
@@ -1077,7 +1066,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// it
         /// </summary>
         /// <returns></returns>
-        protected internal List<EntityBase> GetEntities()
+        protected internal EntityBase[] GetEntities()
         {
             return Entities.GetEntities();
         }
@@ -1086,7 +1075,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             Dictionary<uint, float> topScripts = new Dictionary<uint, float>();
 
-            List<EntityBase> EntityList = GetEntities();
+            EntityBase[] EntityList = GetEntities();
             int limit = 0;
             foreach (EntityBase ent in EntityList)
             {
@@ -1140,7 +1129,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="action"></param>
         protected internal void ForEachSOG(Action<SceneObjectGroup> action)
         {
-            List<EntityBase> objlist = Entities.GetAllByType<SceneObjectGroup>();
+            EntityBase[] objlist = Entities.GetAllByType<SceneObjectGroup>();
             foreach (EntityBase ent in objlist)
             {
                 SceneObjectGroup obj = (SceneObjectGroup)ent;
@@ -1353,7 +1342,7 @@ namespace OpenSim.Region.Framework.Scenes
             SceneObjectGroup group = GetGroupByPrim(localID);
             
             if (group != null)
-            {                
+            {
                 if (group.IsAttachment || (group.RootPart.Shape.PCode == 9 && group.RootPart.Shape.State != 0))
                 {
                     if (m_parentScene.AttachmentsModule != null)
@@ -1798,8 +1787,8 @@ namespace OpenSim.Region.Framework.Scenes
             UUID objid = UUID.Zero;
             SceneObjectPart obj = null;
 
-            List<EntityBase> EntityList = GetEntities();
-            foreach (EntityBase ent in EntityList)
+            EntityBase[] entityList = GetEntities();
+            foreach (EntityBase ent in entityList)
             {
                 if (ent is SceneObjectGroup)
                 {