diff options
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 1fa6a75..64a5811 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -430,8 +430,19 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 430 | 430 | ||
| 431 | if (Scene != null) | 431 | if (Scene != null) |
| 432 | { | 432 | { |
| 433 | if ((Scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || Scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W) | 433 | if ( |
| 434 | || Scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || Scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S)) | 434 | // (Scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) |
| 435 | // || Scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W) | ||
| 436 | // || Scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) | ||
| 437 | // || Scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S)) | ||
| 438 | // Experimental change for better border crossings. | ||
| 439 | // The commented out original lines above would, it seems, trigger | ||
| 440 | // a border crossing a little early or late depending on which | ||
| 441 | // direction the object was moving. | ||
| 442 | (Scene.TestBorderCross(val, Cardinals.E) | ||
| 443 | || Scene.TestBorderCross(val, Cardinals.W) | ||
| 444 | || Scene.TestBorderCross(val, Cardinals.N) | ||
| 445 | || Scene.TestBorderCross(val, Cardinals.S)) | ||
| 435 | && !IsAttachmentCheckFull() && (!Scene.LoadingPrims)) | 446 | && !IsAttachmentCheckFull() && (!Scene.LoadingPrims)) |
| 436 | { | 447 | { |
| 437 | m_scene.CrossPrimGroupIntoNewRegion(val, this, true); | 448 | m_scene.CrossPrimGroupIntoNewRegion(val, this, true); |