aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
diff options
context:
space:
mode:
authorMelanie2010-10-29 21:22:35 +0100
committerMelanie2010-10-29 21:22:35 +0100
commit69c1e0b2f7cfaa195a8496aff1fb23c24a645c6e (patch)
tree2a046b787abced2a1e68b1e62831e0b4f3778323 /OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
parentAdd my work on top of cmickeyb's (diff)
parentRename the new default texture to be consistent with the others (diff)
downloadopensim-SC-69c1e0b2f7cfaa195a8496aff1fb23c24a645c6e.zip
opensim-SC-69c1e0b2f7cfaa195a8496aff1fb23c24a645c6e.tar.gz
opensim-SC-69c1e0b2f7cfaa195a8496aff1fb23c24a645c6e.tar.bz2
opensim-SC-69c1e0b2f7cfaa195a8496aff1fb23c24a645c6e.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs32
1 files changed, 13 insertions, 19 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index facf146..e453618 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -124,15 +124,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
124 m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.GetFromItemID(), remoteClient.AgentId); 124 m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.GetFromItemID(), remoteClient.AgentId);
125 125
126 // Save avatar attachment information 126 // Save avatar attachment information
127 ScenePresence presence; 127 m_log.Info(
128 if (m_scene.AvatarService != null && m_scene.TryGetScenePresence(remoteClient.AgentId, out presence)) 128 "[ATTACHMENTS MODULE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId
129 { 129 + ", AttachmentPoint: " + AttachmentPt);
130 m_log.Info(
131 "[ATTACHMENTS MODULE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId
132 + ", AttachmentPoint: " + AttachmentPt);
133 130
134 m_scene.AvatarService.SetAppearance(remoteClient.AgentId, presence.Appearance); 131 if (m_scene.AvatarFactory != null)
135 } 132 m_scene.AvatarFactory.QueueAppearanceSave(remoteClient.AgentId);
136 } 133 }
137 } 134 }
138 catch (Exception e) 135 catch (Exception e)
@@ -399,8 +396,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
399 item = m_scene.InventoryService.GetItem(item); 396 item = m_scene.InventoryService.GetItem(item);
400 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /* att.UUID */); 397 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /* att.UUID */);
401 398
402 if (m_scene.AvatarService != null) 399 if (m_scene.AvatarFactory != null)
403 m_scene.AvatarService.SetAppearance(remoteClient.AgentId, presence.Appearance); 400 m_scene.AvatarFactory.QueueAppearanceSave(remoteClient.AgentId);
404 } 401 }
405 } 402 }
406 403
@@ -422,11 +419,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
422 presence.Appearance.DetachAttachment(itemID); 419 presence.Appearance.DetachAttachment(itemID);
423 420
424 // Save avatar attachment information 421 // Save avatar attachment information
425 if (m_scene.AvatarService != null) 422 m_log.Debug("[ATTACHMENTS MODULE]: Detaching from UserID: " + remoteClient.AgentId + ", ItemID: " + itemID);
426 { 423 if (m_scene.AvatarFactory != null)
427 m_log.Debug("[ATTACHMENTS MODULE]: Detaching from UserID: " + remoteClient.AgentId + ", ItemID: " + itemID); 424 m_scene.AvatarFactory.QueueAppearanceSave(remoteClient.AgentId);
428 m_scene.AvatarService.SetAppearance(remoteClient.AgentId, presence.Appearance);
429 }
430 } 425 }
431 426
432 DetachSingleAttachmentToInv(itemID, remoteClient); 427 DetachSingleAttachmentToInv(itemID, remoteClient);
@@ -452,10 +447,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
452 447
453 presence.Appearance.DetachAttachment(itemID); 448 presence.Appearance.DetachAttachment(itemID);
454 449
455 if (m_scene.AvatarService != null) 450 if (m_scene.AvatarFactory != null)
456 { 451 m_scene.AvatarFactory.QueueAppearanceSave(remoteClient.AgentId);
457 m_scene.AvatarService.SetAppearance(remoteClient.AgentId, presence.Appearance); 452
458 }
459 part.ParentGroup.DetachToGround(); 453 part.ParentGroup.DetachToGround();
460 454
461 List<UUID> uuids = new List<UUID>(); 455 List<UUID> uuids = new List<UUID>();