From f2810bf03a3e254e0ef8d9bdd639c69cc5cf570c Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 4 Nov 2013 22:10:54 -0800
Subject: varregion: add plumbing to pass region size from Scene down to the
 physics engine. Older physics engines will default to the legacy region size.
 Update BulletSim to use the new region size information.

---
 OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | 6 ++++--
 OpenSim/Region/Physics/Manager/PhysicsScene.cs         | 9 +++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Physics/Manager')

diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
index 8ccfda5..9b06353 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
@@ -32,6 +32,7 @@ using System.Reflection;
 using Nini.Config;
 using log4net;
 using OpenSim.Framework;
+using OpenMetaverse;
 
 namespace OpenSim.Region.Physics.Manager
 {
@@ -66,7 +67,8 @@ namespace OpenSim.Region.Physics.Manager
         /// <param name="meshEngineName"></param>
         /// <param name="config"></param>
         /// <returns></returns>
-        public PhysicsScene GetPhysicsScene(string physEngineName, string meshEngineName, IConfigSource config, string regionName)
+        public PhysicsScene GetPhysicsScene(string physEngineName, string meshEngineName,
+                                    IConfigSource config, string regionName, Vector3 regionExtent)
         {
             if (String.IsNullOrEmpty(physEngineName))
             {
@@ -94,7 +96,7 @@ namespace OpenSim.Region.Physics.Manager
             {
                 m_log.Info("[PHYSICS]: creating " + physEngineName);
                 PhysicsScene result = _PhysPlugins[physEngineName].GetScene(regionName);
-                result.Initialise(meshEngine, config);
+                result.Initialise(meshEngine, config, regionExtent);
                 return result;
             }
             else
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index c93206d..71ad795 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -126,8 +126,17 @@ namespace OpenSim.Region.Physics.Manager
             }
         }
 
+        // Deprecated. Do not use this for new physics engines.
         public abstract void Initialise(IMesher meshmerizer, IConfigSource config);
 
+        // For older physics engines that do not implement non-legacy region sizes.
+        // If the physics engine handles the region extent feature, it overrides this function.
+        public virtual void Initialise(IMesher meshmerizer, IConfigSource config, Vector3 regionExtent)
+        {
+            // If not overridden, call the old initialization entry.
+            Initialise(meshmerizer, config);
+        }
+
         /// <summary>
         /// Add an avatar
         /// </summary>
-- 
cgit v1.1