aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/ContentManagementSystem
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-03 13:45:54 +0000
committerMelanie Thielker2008-10-03 13:45:54 +0000
commit36097a8198772d937c82e7bfc6e01a643d7785af (patch)
treede4a6b516edf12ef24edee02bbd228c1be5d19fd /OpenSim/Region/Environment/Modules/ContentManagementSystem
parentfix the sqlite break. There were two issue here: (diff)
downloadopensim-SC-36097a8198772d937c82e7bfc6e01a643d7785af.zip
opensim-SC-36097a8198772d937c82e7bfc6e01a643d7785af.tar.gz
opensim-SC-36097a8198772d937c82e7bfc6e01a643d7785af.tar.bz2
opensim-SC-36097a8198772d937c82e7bfc6e01a643d7785af.tar.xz
Prevent attachments to be persisted in the destination region when the
avatar is not present there.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/ContentManagementSystem')
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
index 1a41c7b..ff9423f 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
@@ -258,7 +258,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
258 try 258 try
259 { 259 {
260 // I thought that the DeleteGroup() function would handle all of this, but it doesn't. I'm not sure WHAT it handles. 260 // I thought that the DeleteGroup() function would handle all of this, but it doesn't. I'm not sure WHAT it handles.
261 ((SceneObjectGroup)scene.Entities[uuid]).DetachFromBackup((SceneObjectGroup)scene.Entities[uuid]); 261 ((SceneObjectGroup)scene.Entities[uuid]).DetachFromBackup();
262 scene.PhysicsScene.RemovePrim(((SceneObjectGroup)scene.Entities[uuid]).RootPart.PhysActor); 262 scene.PhysicsScene.RemovePrim(((SceneObjectGroup)scene.Entities[uuid]).RootPart.PhysActor);
263 scene.SendKiPrimitive(scene.Entities[uuid].LocalId); 263 scene.SendKiPrimitive(scene.Entities[uuid].LocalId);
264 scene.m_innerScene.DeleteSceneObject(uuid, false); 264 scene.m_innerScene.DeleteSceneObject(uuid, false);