aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-09-06 02:29:22 +0100
committerJustin Clark-Casey (justincc)2011-09-06 02:29:22 +0100
commit5beee42809ad0fbdf559cb82038a5d3d41e98d9e (patch)
tree5ec0ba3669107d8c43872e91c0ea5087de410644
parentIn SetAttachment, if the existing attachment has no asset id then carry on ra... (diff)
downloadopensim-SC_OLD-5beee42809ad0fbdf559cb82038a5d3d41e98d9e.zip
opensim-SC_OLD-5beee42809ad0fbdf559cb82038a5d3d41e98d9e.tar.gz
opensim-SC_OLD-5beee42809ad0fbdf559cb82038a5d3d41e98d9e.tar.bz2
opensim-SC_OLD-5beee42809ad0fbdf559cb82038a5d3d41e98d9e.tar.xz
rename AM.AddSceneObjectAsAttachment() to AddSceneObjectAsNewAttachmentInInv
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 67969b7..af431f4 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -302,7 +302,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
302 302
303 itemID = group.GetFromItemID(); 303 itemID = group.GetFromItemID();
304 if (itemID == UUID.Zero) 304 if (itemID == UUID.Zero)
305 itemID = AddSceneObjectAsAttachment(sp.ControllingClient, group).ID; 305 itemID = AddSceneObjectAsNewAttachmentInInv(sp.ControllingClient, group).ID;
306 306
307 ShowAttachInUserInventory(sp, attachmentPt, itemID, group); 307 ShowAttachInUserInventory(sp, attachmentPt, itemID, group);
308 } 308 }
@@ -733,12 +733,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
733 } 733 }
734 734
735 /// <summary> 735 /// <summary>
736 /// Add a scene object that was previously free in the scene as an attachment to an avatar. 736 /// Add a scene object as a new attachment in the user inventory.
737 /// </summary> 737 /// </summary>
738 /// <param name="remoteClient"></param> 738 /// <param name="remoteClient"></param>
739 /// <param name="grp"></param> 739 /// <param name="grp"></param>
740 /// <returns>The user inventory item created that holds the attachment.</returns> 740 /// <returns>The user inventory item created that holds the attachment.</returns>
741 private InventoryItemBase AddSceneObjectAsAttachment(IClientAPI remoteClient, SceneObjectGroup grp) 741 private InventoryItemBase AddSceneObjectAsNewAttachmentInInv(IClientAPI remoteClient, SceneObjectGroup grp)
742 { 742 {
743// m_log.DebugFormat("[SCENE]: Called AddSceneObjectAsAttachment for object {0} {1} for {2} {3} {4}", grp.Name, grp.LocalId, remoteClient.Name, remoteClient.AgentId, AgentId); 743// m_log.DebugFormat("[SCENE]: Called AddSceneObjectAsAttachment for object {0} {1} for {2} {3} {4}", grp.Name, grp.LocalId, remoteClient.Name, remoteClient.AgentId, AgentId);
744 744