aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorubit2012-06-05 00:50:24 +0200
committerubit2012-06-05 00:50:24 +0200
commit454445fe6aaae03386c6172a0791f711759dcdf0 (patch)
treec9c1f17e1d5fd0c382e6cb1204228fdef0a7df4a /OpenSim/Region/Framework/Scenes/Scene.cs
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/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index a9a4cda..6a120c1 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2692,7 +2692,7 @@ namespace OpenSim.Region.Framework.Scenes
2692 RootPrim.RemFlag(PrimFlags.TemporaryOnRez); 2692 RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
2693 2693
2694 if (AttachmentsModule != null) 2694 if (AttachmentsModule != null)
2695 AttachmentsModule.AttachObject(sp, grp, 0, false); 2695 AttachmentsModule.AttachObject(sp, grp, 0, false, false);
2696 } 2696 }
2697 else 2697 else
2698 { 2698 {