OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve code readability

viewer-2-initial-appearance
Justin Clark-Casey (justincc) 2010-09-15 22:29:58 +01:00
parent 16f296f489
commit 39d27fc879
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
View File

@ -105,7 +105,7 @@ namespace OpenSim.Region.Framework.Scenes
if (permissionToDelete) if (permissionToDelete)
{ {
foreach (SceneObjectGroup g in objectGroups) foreach (SceneObjectGroup g in objectGroups)
g.DeleteGroup(false); g.DeleteGroupFromScene(false);
} }
} }

2
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -2120,7 +2120,7 @@ namespace OpenSim.Region.Framework.Scenes
EventManager.TriggerParcelPrimCountTainted(); EventManager.TriggerParcelPrimCountTainted();
} }
group.DeleteGroup(silent); group.DeleteGroupFromScene(silent);
// m_log.DebugFormat("[SCENE]: Exit DeleteSceneObject() for {0} {1}", group.Name, group.UUID); // m_log.DebugFormat("[SCENE]: Exit DeleteSceneObject() for {0} {1}", group.Name, group.UUID);
} }

2
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -1235,7 +1235,7 @@ namespace OpenSim.Region.Framework.Scenes
/// must be handled by the caller. /// must be handled by the caller.
/// ///
/// <param name="silent">If true then deletion is not broadcast to clients</param> /// <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; List<SceneObjectPart> parts;

2
OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
View File

@ -263,7 +263,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
scene.PhysicsScene.RemovePrim(((SceneObjectGroup)scene.Entities[uuid]).RootPart.PhysActor); scene.PhysicsScene.RemovePrim(((SceneObjectGroup)scene.Entities[uuid]).RootPart.PhysActor);
scene.SendKillObject(scene.Entities[uuid].LocalId); scene.SendKillObject(scene.Entities[uuid].LocalId);
scene.SceneGraph.DeleteSceneObject(uuid, false); scene.SceneGraph.DeleteSceneObject(uuid, false);
((SceneObjectGroup)scene.Entities[uuid]).DeleteGroup(false); ((SceneObjectGroup)scene.Entities[uuid]).DeleteGroupFromScene(false);
} }
catch(Exception e) catch(Exception e)
{ {