aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Attachments
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs17
1 files changed, 14 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 2fa233b..c817559 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -143,6 +143,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
143 143
144 public void SaveChangedAttachments(IScenePresence sp) 144 public void SaveChangedAttachments(IScenePresence sp)
145 { 145 {
146// m_log.DebugFormat("[ATTACHMENTS MODULE]: Saving changed attachments for {0}", sp.Name);
147
146 foreach (SceneObjectGroup grp in sp.GetAttachments()) 148 foreach (SceneObjectGroup grp in sp.GetAttachments())
147 { 149 {
148 if (grp.HasGroupChanged) // Resizer scripts? 150 if (grp.HasGroupChanged) // Resizer scripts?
@@ -242,9 +244,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
242 { 244 {
243 lock (sp.AttachmentsSyncLock) 245 lock (sp.AttachmentsSyncLock)
244 { 246 {
245 // m_log.DebugFormat( 247// m_log.DebugFormat(
246 // "[ATTACHMENTS MODULE]: Attaching object {0} {1} to {2} point {3} from ground (silent = {4})", 248// "[ATTACHMENTS MODULE]: Attaching object {0} {1} to {2} point {3} from ground (silent = {4})",
247 // group.Name, group.LocalId, sp.Name, attachmentPt, silent); 249// group.Name, group.LocalId, sp.Name, attachmentPt, silent);
248 250
249 if (sp.GetAttachments(attachmentPt).Contains(group)) 251 if (sp.GetAttachments(attachmentPt).Contains(group))
250 { 252 {
@@ -365,6 +367,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
365 367
366 public ISceneEntity RezSingleAttachmentFromInventory(ScenePresence sp, UUID itemID, uint AttachmentPt) 368 public ISceneEntity RezSingleAttachmentFromInventory(ScenePresence sp, UUID itemID, uint AttachmentPt)
367 { 369 {
370// m_log.DebugFormat(
371// "[ATTACHMENTS MODULE]: RezSingleAttachmentFromInventory to point {0} from item {1} for {2}",
372// (AttachmentPoint)AttachmentPt, itemID, sp.Name);
373
368 // TODO: this short circuits multiple attachments functionality in LL viewer 2.1+ and should 374 // TODO: this short circuits multiple attachments functionality in LL viewer 2.1+ and should
369 // be removed when that functionality is implemented in opensim 375 // be removed when that functionality is implemented in opensim
370 AttachmentPt &= 0x7f; 376 AttachmentPt &= 0x7f;
@@ -485,6 +491,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
485 491
486 public void DetachObject(uint objectLocalID, IClientAPI remoteClient) 492 public void DetachObject(uint objectLocalID, IClientAPI remoteClient)
487 { 493 {
494// m_log.DebugFormat(
495// "[ATTACHMENTS MODULE]: DetachObject() for object {0} on {1}", objectLocalID, remoteClient.Name);
496
488 SceneObjectGroup group = m_scene.GetGroupByPrim(objectLocalID); 497 SceneObjectGroup group = m_scene.GetGroupByPrim(objectLocalID);
489 if (group != null) 498 if (group != null)
490 { 499 {
@@ -588,6 +597,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
588 // To LocalId or UUID, *THAT* is the question. How now Brown UUID?? 597 // To LocalId or UUID, *THAT* is the question. How now Brown UUID??
589 private void DetachSingleAttachmentToInv(UUID itemID, IScenePresence sp) 598 private void DetachSingleAttachmentToInv(UUID itemID, IScenePresence sp)
590 { 599 {
600// m_log.DebugFormat("[ATTACHMENTS MODULE]: Detaching item {0} to inventory for {1}", itemID, sp.Name);
601
591 if (itemID == UUID.Zero) // If this happened, someone made a mistake.... 602 if (itemID == UUID.Zero) // If this happened, someone made a mistake....
592 return; 603 return;
593 604