* part one of adding physics combining

2 files changed, 19 insertions, 0 deletions

diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 6937a25..139f898 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -162,6 +162,16 @@ namespace OpenSim.Region.Physics.Manager
             return false;
         }
 
+        public virtual bool SupportsCombining()
+        {
+            return false;
+        }
+
+        public virtual void Combine(PhysicsScene pScene, Vector3 offset)
+        {
+            return;
+        }
+
         /// <summary>
         /// Queue a raycast against the physics scene.  
         /// The provided callback method will be called when the raycast is complete
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index e435ac1..81f200a 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -313,6 +313,9 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         private volatile int m_global_contactcount = 0;
 
+        private Vector3 m_worldOffset = Vector3.Zero;
+        private Vector2 m_worldExtents = new Vector2((int)Constants.RegionSize, (int)Constants.RegionSize);
+
         private ODERayCastRequestManager m_rayCastManager;
 
         /// <summary>
@@ -1653,6 +1656,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         private PhysicsActor AddPrim(String name, PhysicsVector position, PhysicsVector size, Quaternion rotation,
                                      IMesh mesh, PrimitiveBaseShape pbs, bool isphysical)
         {
+            
             PhysicsVector pos = new PhysicsVector(position.X, position.Y, position.Z);
             //pos.X = position.X;
             //pos.Y = position.Y;
@@ -2555,6 +2559,9 @@ namespace OpenSim.Region.Physics.OdePlugin
             if (framecount >= int.MaxValue)
                 framecount = 0;
 
+            if (m_worldOffset != Vector3.Zero)
+                return 0;
+
             framecount++;
 
             float fps = 0;
@@ -3377,6 +3384,8 @@ namespace OpenSim.Region.Physics.OdePlugin
             return waterlevel;
         }
 
+
+
         public override void SetWaterLevel(float baseheight)
         {
             waterlevel = baseheight;