aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-09-15 22:29:58 +0100
committerJustin Clark-Casey (justincc)2010-09-15 22:29:58 +0100
commit39d27fc8795e642280cc255c5c1c4ff1c7a915ec (patch)
tree56e552c7a3eaa932e2373916fa514851e9957f85 /OpenSim
parentInstead of locking SOG.Children when a group is being removed from the scene,... (diff)
downloadopensim-SC_OLD-39d27fc8795e642280cc255c5c1c4ff1c7a915ec.zip
opensim-SC_OLD-39d27fc8795e642280cc255c5c1c4ff1c7a915ec.tar.gz
opensim-SC_OLD-39d27fc8795e642280cc255c5c1c4ff1c7a915ec.tar.bz2
opensim-SC_OLD-39d27fc8795e642280cc255c5c1c4ff1c7a915ec.tar.xz
rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve code readability
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs2
4 files changed, 4 insertions, 4 deletions
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
105 if (permissionToDelete) 105 if (permissionToDelete)
106 { 106 {
107 foreach (SceneObjectGroup g in objectGroups) 107 foreach (SceneObjectGroup g in objectGroups)
108 g.DeleteGroup(false); 108 g.DeleteGroupFromScene(false);
109 } 109 }
110 } 110 }
111 111
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
2120 EventManager.TriggerParcelPrimCountTainted(); 2120 EventManager.TriggerParcelPrimCountTainted();
2121 } 2121 }
2122 2122
2123 group.DeleteGroup(silent); 2123 group.DeleteGroupFromScene(silent);
2124 2124
2125// m_log.DebugFormat("[SCENE]: Exit DeleteSceneObject() for {0} {1}", group.Name, group.UUID); 2125// m_log.DebugFormat("[SCENE]: Exit DeleteSceneObject() for {0} {1}", group.Name, group.UUID);
2126 } 2126 }
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
1235 /// must be handled by the caller. 1235 /// must be handled by the caller.
1236 /// 1236 ///
1237 /// <param name="silent">If true then deletion is not broadcast to clients</param> 1237 /// <param name="silent">If true then deletion is not broadcast to clients</param>
1238 public void DeleteGroup(bool silent) 1238 public void DeleteGroupFromScene(bool silent)
1239 { 1239 {
1240 List<SceneObjectPart> parts; 1240 List<SceneObjectPart> parts;
1241 1241
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
263 scene.PhysicsScene.RemovePrim(((SceneObjectGroup)scene.Entities[uuid]).RootPart.PhysActor); 263 scene.PhysicsScene.RemovePrim(((SceneObjectGroup)scene.Entities[uuid]).RootPart.PhysActor);
264 scene.SendKillObject(scene.Entities[uuid].LocalId); 264 scene.SendKillObject(scene.Entities[uuid].LocalId);
265 scene.SceneGraph.DeleteSceneObject(uuid, false); 265 scene.SceneGraph.DeleteSceneObject(uuid, false);
266 ((SceneObjectGroup)scene.Entities[uuid]).DeleteGroup(false); 266 ((SceneObjectGroup)scene.Entities[uuid]).DeleteGroupFromScene(false);
267 } 267 }
268 catch(Exception e) 268 catch(Exception e)
269 { 269 {