aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-09-13 21:05:03 +0100
committerJustin Clark-Casey (justincc)2010-09-13 21:05:03 +0100
commitcd153a20b7e50edfa6a8c0098a456876b3088adf (patch)
tree96caf4dbff5af524d4ce7f1afc3f99e888665b9b
parentIf attachment fails (e.g. because asset wasn't found) then don't try to set a... (diff)
downloadopensim-SC_OLD-cd153a20b7e50edfa6a8c0098a456876b3088adf.zip
opensim-SC_OLD-cd153a20b7e50edfa6a8c0098a456876b3088adf.tar.gz
opensim-SC_OLD-cd153a20b7e50edfa6a8c0098a456876b3088adf.tar.bz2
opensim-SC_OLD-cd153a20b7e50edfa6a8c0098a456876b3088adf.tar.xz
Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interface
No core module is calling and it makes more sense to call methods such as AttachObject() which attach both to the avatar and update inventory appropriately
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs18
-rw-r--r--OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs11
2 files changed, 13 insertions, 16 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index b7ecb55..fe19099 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -300,12 +300,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
300 return null; 300 return null;
301 } 301 }
302 302
303 public UUID SetAttachmentInventoryStatus( 303 /// <summary>
304 /// Update the user inventory to the attachment of an item
305 /// </summary>
306 /// <param name="att"></param>
307 /// <param name="remoteClient"></param>
308 /// <param name="itemID"></param>
309 /// <param name="AttachmentPt"></param>
310 /// <returns></returns>
311 protected UUID SetAttachmentInventoryStatus(
304 SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt) 312 SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
305 { 313 {
306 m_log.DebugFormat( 314// m_log.DebugFormat(
307 "[ATTACHMENTS MODULE]: Updating inventory of {0} to show attachment of {1} (item ID {2})", 315// "[ATTACHMENTS MODULE]: Updating inventory of {0} to show attachment of {1} (item ID {2})",
308 remoteClient.Name, att.Name, itemID); 316// remoteClient.Name, att.Name, itemID);
309 317
310 if (!att.IsDeleted) 318 if (!att.IsDeleted)
311 AttachmentPt = att.RootPart.AttachmentPoint; 319 AttachmentPt = att.RootPart.AttachmentPoint;
@@ -387,7 +395,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
387 // Save avatar attachment information 395 // Save avatar attachment information
388 if (m_scene.AvatarFactory != null) 396 if (m_scene.AvatarFactory != null)
389 { 397 {
390 m_log.Debug("[ATTACHMENTS MODULE]: Dettaching from UserID: " + remoteClient.AgentId + ", ItemID: " + itemID); 398 m_log.Debug("[ATTACHMENTS MODULE]: Detaching from UserID: " + remoteClient.AgentId + ", ItemID: " + itemID);
391 m_scene.AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance); 399 m_scene.AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
392 } 400 }
393 } 401 }
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index 1140b9b..24e481b 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -109,17 +109,6 @@ namespace OpenSim.Region.Framework.Interfaces
109 /// <param name="itemID"></param> 109 /// <param name="itemID"></param>
110 /// <param name="remoteClient"></param> 110 /// <param name="remoteClient"></param>
111 void DetachSingleAttachmentToGround(UUID itemID, IClientAPI remoteClient); 111 void DetachSingleAttachmentToGround(UUID itemID, IClientAPI remoteClient);
112
113 /// <summary>
114 /// Update the user inventory to the attachment of an item
115 /// </summary>
116 /// <param name="att"></param>
117 /// <param name="remoteClient"></param>
118 /// <param name="itemID"></param>
119 /// <param name="AttachmentPt"></param>
120 /// <returns></returns>
121 UUID SetAttachmentInventoryStatus(
122 SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt);
123 112
124 /// <summary> 113 /// <summary>
125 /// Update the user inventory to show a detach. 114 /// Update the user inventory to show a detach.