* Make sure that deleted objects do not send further object updates to the client

3 files changed, 11 insertions, 16 deletions

diff --git a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
index b011600..58e0ca3 100644
--- a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -131,7 +131,7 @@ namespace OpenSim.Region.Environment.Scenes
                         }
                         catch (Exception e)
                         {
-                            m_log.DebugFormat("Exception background deleting object: " +e);
+                            m_log.DebugFormat("Exception background deleting object: " + e);
                         }
                         
                         return true;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 91caada..bf430b9 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1682,6 +1682,9 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         public void SendGroupFullUpdate()
         {
+            if (IsDeleted)
+                return;
+            
             RootPart.SendFullUpdateToAllClients();
 
             lock (m_parts)
@@ -1704,6 +1707,9 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         public void SendGroupTerseUpdate()
         {
+            if (IsDeleted)
+                return;
+            
             lock (m_parts)
             {
                 foreach (SceneObjectPart part in m_parts.Values)
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 74fa725..fa656f6 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -2074,6 +2074,9 @@ if (m_shape != null) {
             //
             if (ParentGroup.IsSelected && IsAttachment)
                 return;
+            
+            if (ParentGroup.IsDeleted)
+                return;
 
             clientFlags &= ~(uint) PrimFlags.CreateSelected;
 
@@ -2179,16 +2182,7 @@ if (m_shape != null) {
         }
 
         /// <summary>
-        /// Send a terse update to the client.
-        /// </summary>
-        /// <param name="remoteClient"></param>
-//        public void SendTerseUpdate(IClientAPI remoteClient)
-//        {
-//            SendTerseUpdateToClient(remoteClient);
-//        }
-
-        /// <summary>
-        ///
+        /// Send a terse update to all clients
         /// </summary>
         public void SendTerseUpdateToAllClients()
         {
@@ -2199,11 +2193,6 @@ if (m_shape != null) {
             }
         }
 
-//        public void SendTerseUpdateToClient(IClientAPI remoteClient, Vector3 lPos)
-//        {
-//            SendTerseUpdateToClient(remoteclient);
-//        }
-
         public void SetAttachmentPoint(uint AttachmentPoint)
         {
             this.AttachmentPoint = AttachmentPoint;