diff options
| author | Melanie | 2010-09-16 18:04:50 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-16 18:04:50 +0100 |
| commit | 58b1ee8e2ca93897415f665bddb5b48966364911 (patch) | |
| tree | caa862e2ecbdb2a9c72d85846f2ece1b19c9b8b1 /OpenSim/Region/OptionalModules | |
| parent | Revert last commit (diff) | |
| parent | Add the modules include line back that i dropped by mistake (diff) | |
| download | opensim-SC-58b1ee8e2ca93897415f665bddb5b48966364911.zip opensim-SC-58b1ee8e2ca93897415f665bddb5b48966364911.tar.gz opensim-SC-58b1ee8e2ca93897415f665bddb5b48966364911.tar.bz2 opensim-SC-58b1ee8e2ca93897415f665bddb5b48966364911.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -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 | { |