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/SceneObjectGroup.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/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index a4ca0fb..d964a6f 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -461,8 +461,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
461 | 461 | ||
462 | if (Scene != null) | 462 | if (Scene != null) |
463 | { | 463 | { |
464 | if ((Scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || Scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W) | 464 | // if ((Scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || Scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W) |
465 | || Scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || Scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S)) | 465 | // || Scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || Scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S)) |
466 | // && !IsAttachmentCheckFull() && (!Scene.LoadingPrims)) | ||
467 | if ((Scene.TestBorderCross(val, Cardinals.E) || Scene.TestBorderCross(val, Cardinals.W) | ||
468 | || Scene.TestBorderCross(val, Cardinals.N) || Scene.TestBorderCross(val, Cardinals.S)) | ||
466 | && !IsAttachmentCheckFull() && (!Scene.LoadingPrims)) | 469 | && !IsAttachmentCheckFull() && (!Scene.LoadingPrims)) |
467 | { | 470 | { |
468 | IEntityTransferModule entityTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); | 471 | IEntityTransferModule entityTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); |
@@ -489,7 +492,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
489 | canCross = false; | 492 | canCross = false; |
490 | break; | 493 | break; |
491 | } | 494 | } |
492 | 495 | ||
493 | m_log.DebugFormat("[SCENE OBJECT]: Avatar {0} needs to be crossed to {1}", av.Name, destination.RegionName); | 496 | m_log.DebugFormat("[SCENE OBJECT]: Avatar {0} needs to be crossed to {1}", av.Name, destination.RegionName); |
494 | } | 497 | } |
495 | 498 | ||