From 2d2bea4aa75ff6e82384f0842fe3719bf946b1cc Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 26 Dec 2013 22:45:59 -0800
Subject: varregion: many more updates removing the constant RegionSize and
 replacing with a passed region size. This time in the map code and grid
 services code.

---
 OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs | 2 +-
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Physics')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
index 17ebed2..aca1ed4 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
@@ -1311,7 +1311,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
         /* TODO */
         ConfigurationParameters[] configparms = new ConfigurationParameters[1];
         configparms[0] = parms;
-        Vector3 worldExtent = new Vector3(Constants.RegionSize, Constants.RegionSize, Constants.RegionHeight);
+        Vector3 worldExtent = maxPosition;
         m_maxCollisions = maxCollisions;
         m_maxUpdatesPerFrame = maxUpdates;
         specialCollisionObjects = new Dictionary<uint, GhostObject>();
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 83ef1f6..fe014fc 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -208,6 +208,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
         Name = EngineType + "/" + RegionName;
     }
 
+    // Old version of initialization that assumes legacy sized regions (256x256)
     public override void Initialise(IMesher meshmerizer, IConfigSource config)
     {
         m_log.ErrorFormat("{0} WARNING WARNING WARNING! BulletSim initialized without region extent specification. Terrain will be messed up.");
-- 
cgit v1.1