diff options
| author | UbitUmarov | 2012-02-15 17:08:33 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-15 16:44:15 +0100 |
| commit | f6f0d884bda8b5179d04a9cfe15efa3908552bcc (patch) | |
| tree | 863560f2d023676b69e97dc2a6898985f58f6ce0 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
| download | opensim-SC-f6f0d884bda8b5179d04a9cfe15efa3908552bcc.zip opensim-SC-f6f0d884bda8b5179d04a9cfe15efa3908552bcc.tar.gz opensim-SC-f6f0d884bda8b5179d04a9cfe15efa3908552bcc.tar.bz2 opensim-SC-f6f0d884bda8b5179d04a9cfe15efa3908552bcc.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 ac39b6b..f9e61be 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -2612,9 +2612,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2612 | Vector3 newpos = new Vector3(PhysActor.Position.GetBytes(), 0); | 2612 | Vector3 newpos = new Vector3(PhysActor.Position.GetBytes(), 0); |
| 2613 | 2613 | ||
| 2614 | if (ParentGroup.Scene.TestBorderCross(newpos, Cardinals.N) | 2614 | if (ParentGroup.Scene.TestBorderCross(newpos, Cardinals.N) |
| 2615 | | ParentGroup.Scene.TestBorderCross(newpos, Cardinals.S) | 2615 | || ParentGroup.Scene.TestBorderCross(newpos, Cardinals.S) |
| 2616 | | ParentGroup.Scene.TestBorderCross(newpos, Cardinals.E) | 2616 | || ParentGroup.Scene.TestBorderCross(newpos, Cardinals.E) |
| 2617 | | ParentGroup.Scene.TestBorderCross(newpos, Cardinals.W)) | 2617 | || ParentGroup.Scene.TestBorderCross(newpos, Cardinals.W)) |
| 2618 | { | 2618 | { |
| 2619 | ParentGroup.AbsolutePosition = newpos; | 2619 | ParentGroup.AbsolutePosition = newpos; |
| 2620 | return; | 2620 | return; |