aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs29
1 files changed, 14 insertions, 15 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 0618add..7200c4b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -391,7 +391,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
391 lock (sp.AttachmentsSyncLock) 391 lock (sp.AttachmentsSyncLock)
392 { 392 {
393 // Save avatar attachment information 393 // Save avatar attachment information
394 m_log.Debug("[ATTACHMENTS MODULE]: Detaching from UserID: " + sp.UUID + ", ItemID: " + itemID); 394// m_log.Debug("[ATTACHMENTS MODULE]: Detaching from UserID: " + sp.UUID + ", ItemID: " + itemID);
395 395
396 bool changed = sp.Appearance.DetachAttachment(itemID); 396 bool changed = sp.Appearance.DetachAttachment(itemID);
397 if (changed && m_scene.AvatarFactory != null) 397 if (changed && m_scene.AvatarFactory != null)
@@ -471,9 +471,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
471 471
472 if (grp.HasGroupChanged || (saveAllScripted && grp.ContainsScripts())) 472 if (grp.HasGroupChanged || (saveAllScripted && grp.ContainsScripts()))
473 { 473 {
474 m_log.DebugFormat( 474// m_log.DebugFormat(
475 "[ATTACHMENTS MODULE]: Updating asset for attachment {0}, attachpoint {1}", 475// "[ATTACHMENTS MODULE]: Updating asset for attachment {0}, attachpoint {1}",
476 grp.UUID, grp.AttachmentPoint); 476// grp.UUID, grp.AttachmentPoint);
477 477
478 string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp); 478 string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp);
479 479
@@ -504,12 +504,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
504 } 504 }
505 grp.HasGroupChanged = false; // Prevent it being saved over and over 505 grp.HasGroupChanged = false; // Prevent it being saved over and over
506 } 506 }
507 else 507// else
508 { 508// {
509 m_log.DebugFormat( 509// m_log.DebugFormat(
510 "[ATTACHMENTS MODULE]: Don't need to update asset for unchanged attachment {0}, attachpoint {1}", 510// "[ATTACHMENTS MODULE]: Don't need to update asset for unchanged attachment {0}, attachpoint {1}",
511 grp.UUID, grp.AttachmentPoint); 511// grp.UUID, grp.AttachmentPoint);
512 } 512// }
513 } 513 }
514 514
515 /// <summary> 515 /// <summary>
@@ -891,13 +891,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
891 // Calls attach with a Zero position 891 // Calls attach with a Zero position
892 if (AttachObject(sp, part.ParentGroup, AttachmentPt, false)) 892 if (AttachObject(sp, part.ParentGroup, AttachmentPt, false))
893 { 893 {
894 m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.FromItemID, remoteClient.AgentId); 894// m_log.Debug(
895// "[ATTACHMENTS MODULE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId
896// + ", AttachmentPoint: " + AttachmentPt);
895 897
896 // Save avatar attachment information 898 // Save avatar attachment information
897 m_log.Debug( 899 m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.FromItemID, remoteClient.AgentId);
898 "[ATTACHMENTS MODULE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId
899 + ", AttachmentPoint: " + AttachmentPt);
900
901 } 900 }
902 } 901 }
903 catch (Exception e) 902 catch (Exception e)