diff options
| author | Melanie | 2012-12-18 09:44:10 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-18 09:44:10 +0000 |
| commit | b9939a46a19af74f79a492e3b9fb3f65d0de31cd (patch) | |
| tree | b20ee4582458689096ff58770397c766c4ac36a8 /OpenSim/Region/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: fix vehicles being shot in the air at border crossings because of ... (diff) | |
| download | opensim-SC-b9939a46a19af74f79a492e3b9fb3f65d0de31cd.zip opensim-SC-b9939a46a19af74f79a492e3b9fb3f65d0de31cd.tar.gz opensim-SC-b9939a46a19af74f79a492e3b9fb3f65d0de31cd.tar.bz2 opensim-SC-b9939a46a19af74f79a492e3b9fb3f65d0de31cd.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index b9f9c86..bc62d51 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -505,11 +505,19 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 505 | 505 | ||
| 506 | if (Scene != null) | 506 | if (Scene != null) |
| 507 | { | 507 | { |
| 508 | // if ((Scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || Scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W) | 508 | if ( |
| 509 | // || Scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || Scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S)) | 509 | // (Scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) |
| 510 | // && !IsAttachmentCheckFull() && (!Scene.LoadingPrims)) | 510 | // || Scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W) |
| 511 | if ((Scene.TestBorderCross(val, Cardinals.E) || Scene.TestBorderCross(val, Cardinals.W) | 511 | // || Scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) |
| 512 | || Scene.TestBorderCross(val, Cardinals.N) || Scene.TestBorderCross(val, Cardinals.S)) | 512 | // || Scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S)) |
| 513 | // Experimental change for better border crossings. | ||
| 514 | // The commented out original lines above would, it seems, trigger | ||
| 515 | // a border crossing a little early or late depending on which | ||
| 516 | // direction the object was moving. | ||
| 517 | (Scene.TestBorderCross(val, Cardinals.E) | ||
| 518 | || Scene.TestBorderCross(val, Cardinals.W) | ||
| 519 | || Scene.TestBorderCross(val, Cardinals.N) | ||
| 520 | || Scene.TestBorderCross(val, Cardinals.S)) | ||
| 513 | && !IsAttachmentCheckFull() && (!Scene.LoadingPrims)) | 521 | && !IsAttachmentCheckFull() && (!Scene.LoadingPrims)) |
| 514 | { | 522 | { |
| 515 | IEntityTransferModule entityTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); | 523 | IEntityTransferModule entityTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); |