aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorubit2012-06-05 00:50:24 +0200
committerubit2012-06-05 00:50:24 +0200
commit454445fe6aaae03386c6172a0791f711759dcdf0 (patch)
treec9c1f17e1d5fd0c382e6cb1204228fdef0a7df4a /OpenSim/Region/ScriptEngine
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentActually trigger land collisions in the root even when a child collides (diff)
downloadopensim-SC-454445fe6aaae03386c6172a0791f711759dcdf0.zip
opensim-SC-454445fe6aaae03386c6172a0791f711759dcdf0.tar.gz
opensim-SC-454445fe6aaae03386c6172a0791f711759dcdf0.tar.bz2
opensim-SC-454445fe6aaae03386c6172a0791f711759dcdf0.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
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 ec0966b..ec44da0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3344,7 +3344,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3344 3344
3345 IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; 3345 IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
3346 if (attachmentsModule != null) 3346 if (attachmentsModule != null)
3347 attachmentsModule.AttachObject(presence, grp, (uint)attachment, false); 3347 attachmentsModule.AttachObject(presence, grp, (uint)attachment, false, true);
3348 } 3348 }
3349 } 3349 }
3350 3350