aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-24 21:14:57 +0100
committerJustin Clark-Casey (justincc)2011-08-24 21:14:57 +0100
commitccf07f6ae337acc9c2b8fa30a784ee01ee3de24e (patch)
tree1e1adcaaa24a0916bf35a9b5fb28c1bca355e1a5
parentadd TestAddAttachmentFromGround() regression test (diff)
downloadopensim-SC_OLD-ccf07f6ae337acc9c2b8fa30a784ee01ee3de24e.zip
opensim-SC_OLD-ccf07f6ae337acc9c2b8fa30a784ee01ee3de24e.tar.gz
opensim-SC_OLD-ccf07f6ae337acc9c2b8fa30a784ee01ee3de24e.tar.bz2
opensim-SC_OLD-ccf07f6ae337acc9c2b8fa30a784ee01ee3de24e.tar.xz
refactor: remove pointless AgentId argument from attachObjectAssetStore()
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index f254974..88fc9e4 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -228,7 +228,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
228 228
229 itemID = group.GetFromItemID(); 229 itemID = group.GetFromItemID();
230 if (itemID == UUID.Zero) 230 if (itemID == UUID.Zero)
231 m_scene.attachObjectAssetStore(sp.ControllingClient, group, sp.UUID, out itemID); 231 m_scene.attachObjectAssetStore(sp.ControllingClient, group, out itemID);
232 232
233 ShowAttachInUserInventory(sp, AttachmentPt, itemID, group); 233 ShowAttachInUserInventory(sp, AttachmentPt, itemID, group);
234 234
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 94126f0..66905fe 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1871,7 +1871,7 @@ namespace OpenSim.Region.Framework.Scenes
1871 } 1871 }
1872 } 1872 }
1873 1873
1874 public UUID attachObjectAssetStore(IClientAPI remoteClient, SceneObjectGroup grp, UUID AgentId, out UUID itemID) 1874 public UUID attachObjectAssetStore(IClientAPI remoteClient, SceneObjectGroup grp, out UUID itemID)
1875 { 1875 {
1876// m_log.DebugFormat("[SCENE]: Called attachObjectAssetStore for object {0} {1} for {2} {3} {4}", grp.Name, grp.LocalId, remoteClient.Name, remoteClient.AgentId, AgentId); 1876// m_log.DebugFormat("[SCENE]: Called attachObjectAssetStore for object {0} {1} for {2} {3} {4}", grp.Name, grp.LocalId, remoteClient.Name, remoteClient.AgentId, AgentId);
1877 1877