diff options
| author | Justin Clark-Casey (justincc) | 2011-10-04 22:49:06 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-10-04 22:49:06 +0100 |
| commit | 8a216dc1ccdc336a22958cd476de034d065cf676 (patch) | |
| tree | 4deca739b301d8414a5c3e632becf568af4deeb6 /OpenSim/Region/ScriptEngine | |
| parent | Clarify explanation of DeleteScriptsOnStartup switch in [XEngine]. (diff) | |
| parent | Removed all refs to IClientAPI from IAttachmentsModule. Separated client hand... (diff) | |
| download | opensim-SC-8a216dc1ccdc336a22958cd476de034d065cf676.zip opensim-SC-8a216dc1ccdc336a22958cd476de034d065cf676.tar.gz opensim-SC-8a216dc1ccdc336a22958cd476de034d065cf676.tar.bz2 opensim-SC-8a216dc1ccdc336a22958cd476de034d065cf676.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
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 04762be..42e09fc 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -3023,7 +3023,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 3023 | 3023 | ||
| 3024 | IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; | 3024 | IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; |
| 3025 | if (attachmentsModule != null) | 3025 | if (attachmentsModule != null) |
| 3026 | attachmentsModule.DetachSingleAttachmentToInv(itemID, presence.ControllingClient); | 3026 | attachmentsModule.DetachSingleAttachmentToInv(presence, itemID); |
| 3027 | } | 3027 | } |
| 3028 | 3028 | ||
| 3029 | public void llTakeCamera(string avatar) | 3029 | public void llTakeCamera(string avatar) |