aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Attachments
diff options
context:
space:
mode:
authorUbitUmarov2014-08-03 19:00:01 +0100
committerUbitUmarov2014-08-03 19:00:01 +0100
commitca8b0e6a1d373b55137febaafd2797e59016d5a8 (patch)
tree367706f8e9d8e621a52522964e75fd45a9bbaaab /OpenSim/Region/CoreModules/Avatar/Attachments
parent several debug msgs, need to be removed asap (diff)
downloadopensim-SC-ca8b0e6a1d373b55137febaafd2797e59016d5a8.zip
opensim-SC-ca8b0e6a1d373b55137febaafd2797e59016d5a8.tar.gz
opensim-SC-ca8b0e6a1d373b55137febaafd2797e59016d5a8.tar.bz2
opensim-SC-ca8b0e6a1d373b55137febaafd2797e59016d5a8.tar.xz
replace debug msgs by others
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs13
1 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 0825a01..c8a25dd 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -388,6 +388,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
388 388
389 Dictionary<SceneObjectGroup, string> scriptStates = new Dictionary<SceneObjectGroup, string>(); 389 Dictionary<SceneObjectGroup, string> scriptStates = new Dictionary<SceneObjectGroup, string>();
390 390
391 m_log.DebugFormat("[ATTACHMENTS MODULE]: enter PrepareScriptInstanceForSave loop");
391 foreach (SceneObjectGroup so in attachments) 392 foreach (SceneObjectGroup so in attachments)
392 { 393 {
393 // Scripts MUST be snapshotted before the object is 394 // Scripts MUST be snapshotted before the object is
@@ -398,13 +399,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
398 scriptStates[so] = PrepareScriptInstanceForSave(so, false); 399 scriptStates[so] = PrepareScriptInstanceForSave(so, false);
399 } 400 }
400 401
402 m_log.DebugFormat("[ATTACHMENTS MODULE]: enter UpdateDetachedObject loop");
401 lock (sp.AttachmentsSyncLock) 403 lock (sp.AttachmentsSyncLock)
402 { 404 {
403 foreach (SceneObjectGroup so in attachments) 405 foreach (SceneObjectGroup so in attachments)
404 UpdateDetachedObject(sp, so, scriptStates[so]); 406 UpdateDetachedObject(sp, so, scriptStates[so]);
405 407 m_log.DebugFormat("[ATTACHMENTS MODULE]: enter ClearAttachments");
406 sp.ClearAttachments(); 408 sp.ClearAttachments();
407 } 409 }
410 m_log.DebugFormat("[ATTACHMENTS MODULE]: derez done");
411
408 } 412 }
409 413
410 public void DeleteAttachmentsFromScene(IScenePresence sp, bool silent) 414 public void DeleteAttachmentsFromScene(IScenePresence sp, bool silent)
@@ -1014,6 +1018,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
1014 // Remove the object from the scene so no more updates 1018 // Remove the object from the scene so no more updates
1015 // are sent. Doing this before the below changes will ensure 1019 // are sent. Doing this before the below changes will ensure
1016 // updates can't cause "HUD artefacts" 1020 // updates can't cause "HUD artefacts"
1021
1022 m_log.WarnFormat("[ATTACHMENTS MODULE]: DeleteSceneObject");
1023
1017 m_scene.DeleteSceneObject(so, false, false); 1024 m_scene.DeleteSceneObject(so, false, false);
1018 1025
1019 // Prepare sog for storage 1026 // Prepare sog for storage
@@ -1023,6 +1030,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
1023 1030
1024 if (saveChanged) 1031 if (saveChanged)
1025 { 1032 {
1033 m_log.WarnFormat("[ATTACHMENTS MODULE]: saveChanged true");
1034
1026 // We cannot use AbsolutePosition here because that would 1035 // We cannot use AbsolutePosition here because that would
1027 // attempt to cross the prim as it is detached 1036 // attempt to cross the prim as it is detached
1028 so.ForEachPart(x => { x.GroupPosition = so.RootPart.AttachedPos; }); 1037 so.ForEachPart(x => { x.GroupPosition = so.RootPart.AttachedPos; });
@@ -1031,7 +1040,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
1031 } 1040 }
1032 1041
1033 // Now, remove the scripts 1042 // Now, remove the scripts
1043 m_log.WarnFormat("[ATTACHMENTS MODULE]: remove scripts");
1034 so.RemoveScriptInstances(true); 1044 so.RemoveScriptInstances(true);
1045 m_log.WarnFormat("[ATTACHMENTS MODULE]: UpdateDetachedObject done");
1035 } 1046 }
1036 1047
1037 protected SceneObjectGroup RezSingleAttachmentFromInventoryInternal( 1048 protected SceneObjectGroup RezSingleAttachmentFromInventoryInternal(