diff options
| author | Diva Canto | 2010-07-14 14:48:14 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-07-14 14:48:14 -0700 |
| commit | 0d8c0811d381951939efd4e2887b872e81a6a34a (patch) | |
| tree | 1424db67347d3e441817cf8860327a8d884b061a /OpenSim/Region/ScriptEngine | |
| parent | Removed a few obsolete mono addin references. Mantis #4854 (diff) | |
| parent | Major attachments cleanup. Remove unused AttachObject ClientView method (diff) | |
| download | opensim-SC-0d8c0811d381951939efd4e2887b872e81a6a34a.zip opensim-SC-0d8c0811d381951939efd4e2887b872e81a6a34a.tar.gz opensim-SC-0d8c0811d381951939efd4e2887b872e81a6a34a.tar.bz2 opensim-SC-0d8c0811d381951939efd4e2887b872e81a6a34a.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 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index c5226ba..dbea6ef 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -2940,9 +2940,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2940 | 2940 | ||
| 2941 | IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; | 2941 | IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; |
| 2942 | if (attachmentsModule != null) | 2942 | if (attachmentsModule != null) |
| 2943 | attachmentsModule.AttachObject( | 2943 | attachmentsModule.AttachObject(presence.ControllingClient, |
| 2944 | presence.ControllingClient, grp.LocalId, | 2944 | grp, (uint)attachment, false); |
| 2945 | (uint)attachment, Quaternion.Identity, Vector3.Zero, false); | ||
| 2946 | } | 2945 | } |
| 2947 | } | 2946 | } |
| 2948 | 2947 | ||