aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
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
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 '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
2 files changed, 2 insertions, 2 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 {
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index a57e9bc..5694c8c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2634,7 +2634,7 @@ namespace OpenSim.Region.Framework.Scenes
2634 colliding.Add(CreateDetObjectForGround()); 2634 colliding.Add(CreateDetObjectForGround());
2635 LandCollidingMessage.Colliders = colliding; 2635 LandCollidingMessage.Colliders = colliding;
2636 2636
2637 notify(LocalId, LandCollidingMessage); 2637 notify(ParentGroup.RootPart.LocalId, LandCollidingMessage);
2638 } 2638 }
2639 } 2639 }
2640 2640