From 39d27fc8795e642280cc255c5c1c4ff1c7a915ec Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 15 Sep 2010 22:29:58 +0100
Subject: rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to
 improve code readability

---
 OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs   | 2 +-
 OpenSim/Region/Framework/Scenes/Scene.cs                          | 2 +-
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs               | 2 +-
 OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
index 916148b..64567db 100644
--- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (permissionToDelete)
             {
                 foreach (SceneObjectGroup g in objectGroups)
-                    g.DeleteGroup(false);
+                    g.DeleteGroupFromScene(false);
             }
         }
         
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index ef97dfc..8a90bc8 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2120,7 +2120,7 @@ namespace OpenSim.Region.Framework.Scenes
                 EventManager.TriggerParcelPrimCountTainted();
             }
 
-            group.DeleteGroup(silent);
+            group.DeleteGroupFromScene(silent);
 
 //            m_log.DebugFormat("[SCENE]: Exit DeleteSceneObject() for {0} {1}", group.Name, group.UUID);
         }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 99c2abf..f9a8d41 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1235,7 +1235,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// must be handled by the caller.
         /// 
         /// <param name="silent">If true then deletion is not broadcast to clients</param>
-        public void DeleteGroup(bool silent)
+        public void DeleteGroupFromScene(bool silent)
         {
             List<SceneObjectPart> parts;
 
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
index fd59138..0b02a9f 100644
--- a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
@@ -263,7 +263,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
                     scene.PhysicsScene.RemovePrim(((SceneObjectGroup)scene.Entities[uuid]).RootPart.PhysActor);
                     scene.SendKillObject(scene.Entities[uuid].LocalId);
                     scene.SceneGraph.DeleteSceneObject(uuid, false);
-                    ((SceneObjectGroup)scene.Entities[uuid]).DeleteGroup(false);
+                    ((SceneObjectGroup)scene.Entities[uuid]).DeleteGroupFromScene(false);
                 }
                 catch(Exception e)
                 {
-- 
cgit v1.1