ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge

Browse Source 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
This commit is contained in:
Melanie
2011-10-12 00:10:30 +01:00
parent 29c31983d8 92c88121c7
commit e4f3ba8610
4 changed files with 507 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -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)