diff options
| author | Justin Clark-Casey (justincc) | 2010-09-15 22:29:58 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-09-15 22:29:58 +0100 |
| commit | 39d27fc8795e642280cc255c5c1c4ff1c7a915ec (patch) | |
| tree | 56e552c7a3eaa932e2373916fa514851e9957f85 /OpenSim/Region/OptionalModules/ContentManagementSystem | |
| parent | Instead of locking SOG.Children when a group is being removed from the scene,... (diff) | |
| download | opensim-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/Region/OptionalModules/ContentManagementSystem')
| -rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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 | { |