* Eliminate SOG.FakeDeleteGroup() since it is now identical with DeleteGroup() (except that is didn't lock the parts, which was a potential race condition)

* Removed fake delete code from LSL_Api.SetFlexi - this code was never activiated anyway and didn't appear to make much sense on the surface

2 files changed, 1 insertions, 25 deletions

diff --git a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
index 7ff78a5..b011600 100644
--- a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Region.Environment.Scenes
         
             // Visually remove it, even if it isnt really gone yet.
             if (permissionToDelete)
-                objectGroup.FakeDeleteGroup();
+                objectGroup.DeleteGroup(false);
         }
         
         private void InventoryRunDeleteTimer(object sender, ElapsedEventArgs e)
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 36b4e10..91caada 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1063,30 +1063,6 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
-        public void FakeDeleteGroup()
-        {
-            // If there are any updates queued for this object when the 'fake' delete happens, then make sure
-            // that they don't happen, otherwise the deleted objects will reappear
-            m_isDeleted = true;
-
-            DetachFromBackup();
-
-            foreach (SceneObjectPart part in m_parts.Values)
-            {
-                List<ScenePresence> avatars = Scene.GetScenePresences();
-                for (int i = 0; i < avatars.Count; i++)
-                {
-                    if (avatars[i].ParentID == LocalId)
-                    {
-                        avatars[i].StandUp();
-                    }
-
-                    if (m_rootPart != null && part == m_rootPart)
-                        avatars[i].ControllingClient.SendKillObject(m_regionHandle, part.LocalId);
-                }
-            }
-        }
-
         public void AddScriptLPS(int count)
         {
             if (scriptScore + count >= float.MaxValue - count)