aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-07-14 23:29:04 +0100
committerJustin Clark-Casey (justincc)2010-07-14 23:29:04 +0100
commit99a6950b3089b7d945d2e7981780e44e469a4ed8 (patch)
tree9f1a58921f77da1e393352b1c1ed2e383f5da317 /OpenSim/Region/ScriptEngine/Shared
parentimprove closing of load/save iar streams in the event of a problem (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-99a6950b3089b7d945d2e7981780e44e469a4ed8.zip
opensim-SC_OLD-99a6950b3089b7d945d2e7981780e44e469a4ed8.tar.gz
opensim-SC_OLD-99a6950b3089b7d945d2e7981780e44e469a4ed8.tar.bz2
opensim-SC_OLD-99a6950b3089b7d945d2e7981780e44e469a4ed8.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs5
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