1 files changed, 21 insertions, 67 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 5951a92..014b007 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -377,6 +377,7 @@ namespace OpenSim.Region.Framework.Scenes
                         RootPart.ScriptSetPhysicsStatus(false);
                         Scene.SimChat(Utils.StringToBytes("Hit Sandbox Limit"),
                               ChatTypeEnum.DebugChannel, 0x7FFFFFFF, RootPart.AbsolutePosition, Name, UUID, false);
+                        lockPartsForRead(false);
                         return;
                     }
                 }
@@ -489,8 +490,8 @@ namespace OpenSim.Region.Framework.Scenes
         private List<SceneObjectPart> m_PlaySoundSlavePrims = new List<SceneObjectPart>();
         public List<SceneObjectPart> PlaySoundSlavePrims
         {
-            get { return m_LoopSoundSlavePrims; }
-            set { m_LoopSoundSlavePrims = value; }
+            get { return m_PlaySoundSlavePrims; }
+            set { m_PlaySoundSlavePrims = value; }
         }
 
         private SceneObjectPart m_LoopSoundMasterPrim = null;
@@ -644,7 +645,7 @@ namespace OpenSim.Region.Framework.Scenes
             ApplyPhysics(m_scene.m_physicalPrim);
 
             // Don't trigger the update here - otherwise some client issues occur when multiple updates are scheduled
-            // for the same object with very different properties.  The caller must schedule the update.            
+            // for the same object with very different properties.  The caller must schedule the update.
             //ScheduleGroupForFullUpdate();
         }
 
@@ -1369,21 +1370,20 @@ namespace OpenSim.Region.Framework.Scenes
             {
 //                    part.Inventory.RemoveScriptInstances();
                 
-                ScenePresence[] avatars = Scene.GetScenePresences();
-                for (int i = 0; i < avatars.Length; i++)
+                Scene.ForEachScenePresence(delegate (ScenePresence sp)
                 {
-                    if (avatars[i].ParentID == LocalId)
+                    if (sp.ParentID == LocalId)
                     {
-                        avatars[i].StandUp();
+                        sp.StandUp();
                     }
 
                     if (!silent)
                     {
                         part.UpdateFlag = 0;
                         if (part == m_rootPart)
-                            avatars[i].ControllingClient.SendKillObject(m_regionHandle, part.LocalId);
+                            sp.ControllingClient.SendKillObject(m_regionHandle, part.LocalId);
                     }
-                }
+                });
                 
             }
             
@@ -1605,11 +1605,10 @@ namespace OpenSim.Region.Framework.Scenes
 
         #endregion
 
-        #region Client Updating
-
         public void SendFullUpdateToClient(IClientAPI remoteClient)
         {
-            SendPartFullUpdate(remoteClient, RootPart, m_scene.Permissions.GenerateClientFlags(remoteClient.AgentId, RootPart.UUID));
+            RootPart.SendFullUpdate(
+                remoteClient, m_scene.Permissions.GenerateClientFlags(remoteClient.AgentId, RootPart.UUID));
 
             lockPartsForRead(true);
             {
@@ -1617,42 +1616,12 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     
                     if (part != RootPart)
-                        SendPartFullUpdate(remoteClient, part, m_scene.Permissions.GenerateClientFlags(remoteClient.AgentId, part.UUID));
-                    
-                }
-            }
-            lockPartsForRead(false);
-        }
-
-        /// <summary>
-        /// Send a full update to the client for the given part
-        /// </summary>
-        /// <param name="remoteClient"></param>
-        /// <param name="part"></param>
-        internal void SendPartFullUpdate(IClientAPI remoteClient, SceneObjectPart part, uint clientFlags)
-        {
-//            m_log.DebugFormat(
-//                "[SOG]: Sendinging part full update to {0} for {1} {2}", remoteClient.Name, part.Name, part.LocalId);
-            
-            if (m_rootPart.UUID == part.UUID)
-            {
-                if (IsAttachment)
-                {
-                    part.SendFullUpdateToClient(remoteClient, m_rootPart.AttachedPos, clientFlags);
-                }
-                else
-                {
-                    part.SendFullUpdateToClient(remoteClient, AbsolutePosition, clientFlags);
+                        part.SendFullUpdate(
+                            remoteClient, m_scene.Permissions.GenerateClientFlags(remoteClient.AgentId, part.UUID));
                 }
             }
-            else
-            {
-                part.SendFullUpdateToClient(remoteClient, clientFlags);
-            }
         }
 
-        #endregion
-
         #region Copying
 
         /// <summary>
@@ -2164,14 +2133,12 @@ namespace OpenSim.Region.Framework.Scenes
         public void ScheduleTerseUpdateToAvatar(ScenePresence presence)
         {
             lockPartsForRead(true);
+
+            foreach (SceneObjectPart part in m_parts.Values)
             {
-                foreach (SceneObjectPart part in m_parts.Values)
-                {
-                    
-                    part.AddTerseUpdateToAvatar(presence);
-                    
-                }
+                part.AddTerseUpdateToAvatar(presence);
             }
+
             lockPartsForRead(false);
         }
 
@@ -2203,21 +2170,12 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void ScheduleGroupForTerseUpdate()
         {
-<<<<<<< HEAD:OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
             lockPartsForRead(true);
-=======
-//            m_log.DebugFormat("[SOG]: Scheduling terse update for {0} {1}", Name, UUID);
-            
-            lock (m_parts)
->>>>>>> 0.6.9-post-fixes:OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+            foreach (SceneObjectPart part in m_parts.Values)
             {
-                foreach (SceneObjectPart part in m_parts.Values)
-                {
-                    
-                    part.ScheduleTerseUpdate();
-                    
-                }
+                part.ScheduleTerseUpdate();
             }
+
             lockPartsForRead(false);
         }
 
@@ -3071,8 +3029,8 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         if (obPart.UUID != m_rootPart.UUID)
                         {
-                            obPart.IgnoreUndoUpdate = true;
                             Vector3 oldSize = new Vector3(obPart.Scale);
+                            obPart.IgnoreUndoUpdate = true;
 
                             float f = 1.0f;
                             float a = 1.0f;
@@ -3765,15 +3723,11 @@ namespace OpenSim.Region.Framework.Scenes
 
                 HasGroupChanged = true;
             }
-<<<<<<< HEAD:OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
             lockPartsForRead(false);
-            ScheduleGroupForFullUpdate();
-=======
 
             // Don't trigger the update here - otherwise some client issues occur when multiple updates are scheduled
             // for the same object with very different properties.  The caller must schedule the update.
             //ScheduleGroupForFullUpdate();
->>>>>>> 0.6.9-post-fixes:OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
         }
 
         public void TriggerScriptChangedEvent(Changed val)