Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge

Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
author: Melanie 2011-10-12 00:10:30 +0100
committer: Melanie 2011-10-12 00:10:30 +0100
commit: e4f3ba8610dc7648cb9d789fbaa35276b92fb975 (patch)
tree: dd973171f9999c769ac823d27a457c24f411f226 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation
parent: Merge commit 'bfa405e6f70ee31510a20f708327c1c254398926' into bigmerge (diff)
parent: Removed all refs to IClientAPI from IAttachmentsModule. Separated client hand... (diff)
download: opensim-SC_OLD-e4f3ba8610dc7648cb9d789fbaa35276b92fb975.zip
opensim-SC_OLD-e4f3ba8610dc7648cb9d789fbaa35276b92fb975.tar.gz
opensim-SC_OLD-e4f3ba8610dc7648cb9d789fbaa35276b92fb975.tar.bz2
opensim-SC_OLD-e4f3ba8610dc7648cb9d789fbaa35276b92fb975.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index fb595fe..03c1e12 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3316,7 +3316,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
            if (attachmentsModule != null)
-                attachmentsModule.DetachSingleAttachmentToInv(itemID, presence.ControllingClient);
+                attachmentsModule.DetachSingleAttachmentToInv(presence, itemID);
        }
        public void llTakeCamera(string avatar)
author	Melanie	2011-10-12 00:10:30 +0100
committer	Melanie	2011-10-12 00:10:30 +0100
commit	e4f3ba8610dc7648cb9d789fbaa35276b92fb975 (patch)
tree	dd973171f9999c769ac823d27a457c24f411f226 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation
parent	Merge commit 'bfa405e6f70ee31510a20f708327c1c254398926' into bigmerge (diff)
parent	Removed all refs to IClientAPI from IAttachmentsModule. Separated client hand... (diff)
download	opensim-SC_OLD-e4f3ba8610dc7648cb9d789fbaa35276b92fb975.zip opensim-SC_OLD-e4f3ba8610dc7648cb9d789fbaa35276b92fb975.tar.gz opensim-SC_OLD-e4f3ba8610dc7648cb9d789fbaa35276b92fb975.tar.bz2 opensim-SC_OLD-e4f3ba8610dc7648cb9d789fbaa35276b92fb975.tar.xz

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index fb595fe..03c1e12 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3316,7 +3316,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3316		3316
3317	IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;	3317	IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
3318	if (attachmentsModule != null)	3318	if (attachmentsModule != null)
3319	attachmentsModule.DetachSingleAttachmentToInv(itemID, presence.ControllingClient);	3319	attachmentsModule.DetachSingleAttachmentToInv(presence, itemID);
3320	}	3320	}
3321		3321
3322	public void llTakeCamera(string avatar)	3322	public void llTakeCamera(string avatar)