diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 5bc6631..2c7cd40 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -1025,9 +1025,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
1025 | // Remove the object from the scene so no more updates | 1025 | // Remove the object from the scene so no more updates |
1026 | // are sent. Doing this before the below changes will ensure | 1026 | // are sent. Doing this before the below changes will ensure |
1027 | // updates can't cause "HUD artefacts" | 1027 | // updates can't cause "HUD artefacts" |
1028 | 1028 | ||
1029 | m_log.WarnFormat("[ATTACHMENTS MODULE]: DeleteSceneObject"); | ||
1030 | |||
1031 | m_scene.DeleteSceneObject(so, false, false); | 1029 | m_scene.DeleteSceneObject(so, false, false); |
1032 | 1030 | ||
1033 | // Prepare sog for storage | 1031 | // Prepare sog for storage |
@@ -1037,8 +1035,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
1037 | 1035 | ||
1038 | if (saveChanged) | 1036 | if (saveChanged) |
1039 | { | 1037 | { |
1040 | m_log.WarnFormat("[ATTACHMENTS MODULE]: saveChanged true"); | ||
1041 | |||
1042 | // We cannot use AbsolutePosition here because that would | 1038 | // We cannot use AbsolutePosition here because that would |
1043 | // attempt to cross the prim as it is detached | 1039 | // attempt to cross the prim as it is detached |
1044 | so.ForEachPart(x => { x.GroupPosition = so.RootPart.AttachedPos; }); | 1040 | so.ForEachPart(x => { x.GroupPosition = so.RootPart.AttachedPos; }); |
@@ -1047,9 +1043,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
1047 | } | 1043 | } |
1048 | 1044 | ||
1049 | // Now, remove the scripts | 1045 | // Now, remove the scripts |
1050 | m_log.WarnFormat("[ATTACHMENTS MODULE]: remove scripts"); | ||
1051 | so.RemoveScriptInstances(true); | 1046 | so.RemoveScriptInstances(true); |
1052 | m_log.WarnFormat("[ATTACHMENTS MODULE]: UpdateDetachedObject done"); | ||
1053 | } | 1047 | } |
1054 | 1048 | ||
1055 | protected SceneObjectGroup RezSingleAttachmentFromInventoryInternal( | 1049 | protected SceneObjectGroup RezSingleAttachmentFromInventoryInternal( |