aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorRobert Adams2012-12-16 21:12:01 -0800
committerRobert Adams2012-12-16 21:19:12 -0800
commit8a95953bb7c35ec1f2b6d97520c56178778ef729 (patch)
treed1cc2bc6eebc17f1a4dc98b2424de27bcb8ffff2 /OpenSim/Region/Framework
parentAdd stack dump function that takes an alternate printer outter. I've found th... (diff)
downloadopensim-SC_OLD-8a95953bb7c35ec1f2b6d97520c56178778ef729.zip
opensim-SC_OLD-8a95953bb7c35ec1f2b6d97520c56178778ef729.tar.gz
opensim-SC_OLD-8a95953bb7c35ec1f2b6d97520c56178778ef729.tar.bz2
opensim-SC_OLD-8a95953bb7c35ec1f2b6d97520c56178778ef729.tar.xz
BulletSim: experimentally remove unit displacement from prim border crossing test. This seems to cause border crossing to be sensed either a little early or a little late depending on which directin the object is moving. If border crossings become totally borked or someone remembers why this was displacement was done, revert this change.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs15
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);