diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 7270304..5604f49 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -48,8 +48,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
48 | 48 | ||
49 | protected Scene m_scene = null; | 49 | protected Scene m_scene = null; |
50 | 50 | ||
51 | public string Name { get { return "Attachments Module"; } } | 51 | public string Name { get { return "Attachments Module"; } } |
52 | public Type ReplaceableInterface { get { return null; } } | 52 | public Type ReplaceableInterface { get { return null; } } |
53 | 53 | ||
54 | public void Initialise(IConfigSource source) {} | 54 | public void Initialise(IConfigSource source) {} |
55 | 55 | ||
@@ -80,7 +80,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
80 | client.OnRezMultipleAttachmentsFromInv += RezMultipleAttachmentsFromInventory; | 80 | client.OnRezMultipleAttachmentsFromInv += RezMultipleAttachmentsFromInventory; |
81 | client.OnObjectAttach += AttachObject; | 81 | client.OnObjectAttach += AttachObject; |
82 | client.OnObjectDetach += DetachObject; | 82 | client.OnObjectDetach += DetachObject; |
83 | client.OnDetachAttachmentIntoInv += ShowDetachInUserInventory; | 83 | client.OnDetachAttachmentIntoInv += ShowDetachInUserInventory; |
84 | } | 84 | } |
85 | 85 | ||
86 | public void UnsubscribeFromClientEvents(IClientAPI client) | 86 | public void UnsubscribeFromClientEvents(IClientAPI client) |
@@ -89,7 +89,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
89 | client.OnRezMultipleAttachmentsFromInv -= RezMultipleAttachmentsFromInventory; | 89 | client.OnRezMultipleAttachmentsFromInv -= RezMultipleAttachmentsFromInventory; |
90 | client.OnObjectAttach -= AttachObject; | 90 | client.OnObjectAttach -= AttachObject; |
91 | client.OnObjectDetach -= DetachObject; | 91 | client.OnObjectDetach -= DetachObject; |
92 | client.OnDetachAttachmentIntoInv -= ShowDetachInUserInventory; | 92 | client.OnDetachAttachmentIntoInv -= ShowDetachInUserInventory; |
93 | } | 93 | } |
94 | 94 | ||
95 | /// <summary> | 95 | /// <summary> |
@@ -173,12 +173,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
173 | UUID itemID = UUID.Zero; | 173 | UUID itemID = UUID.Zero; |
174 | if (sp != null) | 174 | if (sp != null) |
175 | { | 175 | { |
176 | foreach(SceneObjectGroup grp in sp.GetAttachments(AttachmentPt)) | 176 | foreach (SceneObjectGroup grp in sp.GetAttachments(AttachmentPt)) |
177 | { | 177 | { |
178 | itemID = grp.GetFromItemID(); | 178 | itemID = grp.GetFromItemID(); |
179 | if (itemID != UUID.Zero) | 179 | if (itemID != UUID.Zero) |
180 | DetachSingleAttachmentToInv(itemID, remoteClient); | 180 | DetachSingleAttachmentToInv(itemID, remoteClient); |
181 | } | 181 | } |
182 | } | 182 | } |
183 | 183 | ||
184 | if (group.GetFromItemID() == UUID.Zero) | 184 | if (group.GetFromItemID() == UUID.Zero) |
@@ -225,7 +225,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
225 | 225 | ||
226 | public UUID RezSingleAttachmentFromInventory( | 226 | public UUID RezSingleAttachmentFromInventory( |
227 | IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus) | 227 | IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus) |
228 | { | 228 | { |
229 | SceneObjectGroup att = RezSingleAttachmentFromInventoryInternal(remoteClient, itemID, AttachmentPt); | 229 | SceneObjectGroup att = RezSingleAttachmentFromInventoryInternal(remoteClient, itemID, AttachmentPt); |
230 | 230 | ||
231 | if (updateInventoryStatus) | 231 | if (updateInventoryStatus) |
@@ -241,8 +241,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
241 | if (null == att) | 241 | if (null == att) |
242 | return UUID.Zero; | 242 | return UUID.Zero; |
243 | else | 243 | else |
244 | return att.UUID; | 244 | return att.UUID; |
245 | } | 245 | } |
246 | 246 | ||
247 | protected SceneObjectGroup RezSingleAttachmentFromInventoryInternal( | 247 | protected SceneObjectGroup RezSingleAttachmentFromInventoryInternal( |
248 | IClientAPI remoteClient, UUID itemID, uint AttachmentPt) | 248 | IClientAPI remoteClient, UUID itemID, uint AttachmentPt) |
@@ -298,7 +298,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
298 | } | 298 | } |
299 | 299 | ||
300 | return null; | 300 | return null; |
301 | } | 301 | } |
302 | 302 | ||
303 | public UUID SetAttachmentInventoryStatus( | 303 | public UUID SetAttachmentInventoryStatus( |
304 | SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt) | 304 | SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt) |
@@ -473,7 +473,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
473 | sog.RootPart.IsAttachment = false; | 473 | sog.RootPart.IsAttachment = false; |
474 | sog.AbsolutePosition = sog.RootPart.AttachedPos; | 474 | sog.AbsolutePosition = sog.RootPart.AttachedPos; |
475 | UpdateKnownItem(client, sog, sog.GetFromItemID(), sog.OwnerID); | 475 | UpdateKnownItem(client, sog, sog.GetFromItemID(), sog.OwnerID); |
476 | sog.SetAttachmentPoint(attachmentPoint); | 476 | sog.SetAttachmentPoint(attachmentPoint); |
477 | } | 477 | } |
478 | 478 | ||
479 | /// <summary> | 479 | /// <summary> |
@@ -600,7 +600,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
600 | // In case it is later dropped again, don't let | 600 | // In case it is later dropped again, don't let |
601 | // it get cleaned up | 601 | // it get cleaned up |
602 | so.RootPart.RemFlag(PrimFlags.TemporaryOnRez); | 602 | so.RootPart.RemFlag(PrimFlags.TemporaryOnRez); |
603 | so.HasGroupChanged = false; | 603 | so.HasGroupChanged = false; |
604 | } | 604 | } |
605 | } | 605 | } |
606 | } | 606 | } |