diff options
author | UbitUmarov | 2012-02-15 17:08:33 +0000 |
---|---|---|
committer | UbitUmarov | 2012-02-15 17:08:33 +0000 |
commit | a758abaa9fa7250d1b61bcd906ca12539307851d (patch) | |
tree | 054b6f66b0c62b66f77e433607ed0aab3245b396 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
download | opensim-SC-a758abaa9fa7250d1b61bcd906ca12539307851d.zip opensim-SC-a758abaa9fa7250d1b61bcd906ca12539307851d.tar.gz opensim-SC-a758abaa9fa7250d1b61bcd906ca12539307851d.tar.bz2 opensim-SC-a758abaa9fa7250d1b61bcd906ca12539307851d.tar.xz |
try to make crossings work better. chode no longer prevents crossings i hope
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 577c0d3..19dedde 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2620,9 +2620,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
2620 | Vector3 newpos = new Vector3(PhysActor.Position.GetBytes(), 0); | 2620 | Vector3 newpos = new Vector3(PhysActor.Position.GetBytes(), 0); |
2621 | 2621 | ||
2622 | if (ParentGroup.Scene.TestBorderCross(newpos, Cardinals.N) | 2622 | if (ParentGroup.Scene.TestBorderCross(newpos, Cardinals.N) |
2623 | | ParentGroup.Scene.TestBorderCross(newpos, Cardinals.S) | 2623 | || ParentGroup.Scene.TestBorderCross(newpos, Cardinals.S) |
2624 | | ParentGroup.Scene.TestBorderCross(newpos, Cardinals.E) | 2624 | || ParentGroup.Scene.TestBorderCross(newpos, Cardinals.E) |
2625 | | ParentGroup.Scene.TestBorderCross(newpos, Cardinals.W)) | 2625 | || ParentGroup.Scene.TestBorderCross(newpos, Cardinals.W)) |
2626 | { | 2626 | { |
2627 | ParentGroup.AbsolutePosition = newpos; | 2627 | ParentGroup.AbsolutePosition = newpos; |
2628 | return; | 2628 | return; |