1 files changed, 72 insertions, 8 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index ce11267..c16ba12 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -70,6 +70,9 @@ namespace OpenSim.Region.Framework.Scenes
 
         protected Dictionary<UUID, ScenePresence> m_scenePresences = new Dictionary<UUID, ScenePresence>();
         protected ScenePresence[] m_scenePresenceArray = new ScenePresence[0];
+        protected List<ScenePresence> m_scenePresenceList = new List<ScenePresence>();
+
+        protected OpenMetaverse.ReaderWriterLockSlim m_scenePresencesLock = new OpenMetaverse.ReaderWriterLockSlim();
 
         // SceneObjects is not currently populated or used.
         //public Dictionary<UUID, SceneObjectGroup> SceneObjects;
@@ -132,10 +135,16 @@ namespace OpenSim.Region.Framework.Scenes
 
         protected internal void Close()
         {
-            lock (m_scenePresences)
+            m_scenePresencesLock.EnterWriteLock();
+            try
             {
                 m_scenePresences.Clear();
                 m_scenePresenceArray = new ScenePresence[0];
+                m_scenePresenceList = new List<ScenePresence>();
+            }
+            finally
+            {
+                m_scenePresencesLock.ExitWriteLock();
             }
 
             lock (m_dictionary_lock)
@@ -225,6 +234,30 @@ namespace OpenSim.Region.Framework.Scenes
         protected internal bool AddRestoredSceneObject(
             SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted)
         {
+                // KF: Check for out-of-region, move inside and make static.
+                        Vector3 npos = new Vector3(sceneObject.RootPart.GroupPosition.X,
+                                                           sceneObject.RootPart.GroupPosition.Y,
+                                                           sceneObject.RootPart.GroupPosition.Z);
+                        if (!(((sceneObject.RootPart.Shape.PCode == (byte)PCode.Prim) && (sceneObject.RootPart.Shape.State != 0))) && (npos.X < 0.0 || npos.Y < 0.0 || npos.Z < 0.0 ||
+                            npos.X > Constants.RegionSize ||
+                            npos.Y > Constants.RegionSize))
+                        {
+                                if (npos.X < 0.0) npos.X = 1.0f;
+                                if (npos.Y < 0.0) npos.Y = 1.0f;
+                                if (npos.Z < 0.0) npos.Z = 0.0f;
+                                if (npos.X > Constants.RegionSize) npos.X = Constants.RegionSize - 1.0f;
+                                if (npos.Y > Constants.RegionSize) npos.Y = Constants.RegionSize - 1.0f;
+ 
+                foreach (SceneObjectPart part in sceneObject.Children.Values)
+                {
+                        part.GroupPosition = npos;
+                }
+                sceneObject.RootPart.Velocity = Vector3.Zero;
+                sceneObject.RootPart.AngularVelocity = Vector3.Zero;
+                sceneObject.RootPart.Acceleration = Vector3.Zero;
+                sceneObject.RootPart.Velocity = Vector3.Zero;
+                        }
+                        
             if (!alreadyPersisted)
             {
                 sceneObject.ForceInventoryPersistence();
@@ -518,7 +551,8 @@ namespace OpenSim.Region.Framework.Scenes
 
             Entities[presence.UUID] = presence;
 
-            lock (m_scenePresences)
+            m_scenePresencesLock.EnterWriteLock();
+            try
             {
                 if (!m_scenePresences.ContainsKey(presence.UUID))
                 {
@@ -530,11 +564,12 @@ namespace OpenSim.Region.Framework.Scenes
                     Array.Copy(m_scenePresenceArray, newArray, oldLength);
                     newArray[oldLength] = presence;
                     m_scenePresenceArray = newArray;
+                    m_scenePresenceList = new List<ScenePresence>(m_scenePresenceArray);
                 }
                 else
                 {
                     m_scenePresences[presence.UUID] = presence;
-                    
+
                     // Do a linear search through the array of ScenePresence references
                     // and update the modified entry
                     for (int i = 0; i < m_scenePresenceArray.Length; i++)
@@ -545,8 +580,13 @@ namespace OpenSim.Region.Framework.Scenes
                             break;
                         }
                     }
+                    m_scenePresenceList = new List<ScenePresence>(m_scenePresenceArray);
                 }
             }
+            finally
+            {
+                m_scenePresencesLock.ExitWriteLock();
+            }
         }
 
         /// <summary>
@@ -561,7 +601,8 @@ namespace OpenSim.Region.Framework.Scenes
                     agentID);
             }
 
-            lock (m_scenePresences)
+            m_scenePresencesLock.EnterWriteLock();
+            try
             {
                 if (m_scenePresences.Remove(agentID))
                 {
@@ -580,12 +621,17 @@ namespace OpenSim.Region.Framework.Scenes
                         }
                     }
                     m_scenePresenceArray = newArray;
+                    m_scenePresenceList = new List<ScenePresence>(m_scenePresenceArray);
                 }
                 else
                 {
                     m_log.WarnFormat("[SCENE] Tried to remove non-existent scene presence with agent ID {0} from scene ScenePresences list", agentID);
                 }
             }
+            finally
+            {
+                m_scenePresencesLock.ExitWriteLock();
+            }
         }
 
         protected internal void SwapRootChildAgent(bool direction_RC_CR_T_F)
@@ -706,8 +752,15 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns></returns>
         private List<ScenePresence> GetScenePresences()
         {
-            lock (m_scenePresences)
-                return new List<ScenePresence>(m_scenePresenceArray);
+            m_scenePresencesLock.EnterReadLock();
+            try
+            {
+                return m_scenePresenceList;
+            }
+            finally
+            {
+                m_scenePresencesLock.ExitReadLock();
+            }
         }
 
         /// <summary>
@@ -718,10 +771,15 @@ namespace OpenSim.Region.Framework.Scenes
         protected internal ScenePresence GetScenePresence(UUID agentID)
         {
             ScenePresence sp;
-            lock (m_scenePresences)
+            m_scenePresencesLock.EnterReadLock();
+            try
             {
                 m_scenePresences.TryGetValue(agentID, out sp);
             }
+            finally
+            {
+                m_scenePresencesLock.ExitReadLock();
+            }
             return sp;
         }
 
@@ -756,10 +814,15 @@ namespace OpenSim.Region.Framework.Scenes
 
         protected internal bool TryGetScenePresence(UUID agentID, out ScenePresence avatar)
         {
-            lock (m_scenePresences)
+            m_scenePresencesLock.EnterReadLock();
+            try
             {
                 m_scenePresences.TryGetValue(agentID, out avatar);
             }
+            finally
+            {
+                m_scenePresencesLock.ExitReadLock();
+            }
             return (avatar != null);
         }
 
@@ -1037,6 +1100,7 @@ namespace OpenSim.Region.Framework.Scenes
             Parallel.ForEach<ScenePresence>(GetScenePresences(), protectedAction);
             */
             // For now, perform actiona serially
+            
             foreach (ScenePresence sp in GetScenePresences())
             {
                 try