1 files changed, 39 insertions, 11 deletions

diff --git a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
index 353db44..b5b30ee 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
@@ -1536,7 +1536,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 List<OdePrim> removeprims = null;
                 foreach (OdePrim chr in _activeprims)
                 {
-                    if (chr.Body != IntPtr.Zero && d.BodyIsEnabled(chr.Body) && (!chr.m_disabled))
+                    if (chr.Body != IntPtr.Zero && d.BodyIsEnabled(chr.Body) && (!chr.m_disabled) && !chr.m_outofBounds)
                     {
                         try
                         {
@@ -1736,6 +1736,23 @@ namespace OpenSim.Region.Physics.OdePlugin
             return newPrim;
         }
 
+        private PhysicsActor AddPrim(String name, Vector3 position, PhysicsActor parent,
+                                     PrimitiveBaseShape pbs, uint localid, byte[] sdata)
+        {
+            Vector3 pos = position;
+
+            OdePrim newPrim;
+            lock (OdeLock)
+            {
+                newPrim = new OdePrim(name, this, pos, parent, pbs, ode, localid, sdata);               
+                lock (_prims)
+                    _prims.Add(newPrim);
+            }
+
+            return newPrim;
+        }
+
+
         public void addActivePrim(OdePrim activatePrim)
         {
             // adds active prim..   (ones that should be iterated over in collisions_optimized
@@ -1762,6 +1779,17 @@ namespace OpenSim.Region.Physics.OdePlugin
             return result;
         }
 
+        public override PhysicsActor AddPrimShape(string primName, PhysicsActor parent, PrimitiveBaseShape pbs, Vector3 position,
+                                                  uint localid, byte[] sdata)
+        {
+            PhysicsActor result;
+
+            result = AddPrim(primName, position, parent,
+                                     pbs, localid, sdata);
+
+            return result;
+        }
+
         public override float TimeDilation
         {
             get { return m_timeDilation; }
@@ -3410,17 +3438,17 @@ namespace OpenSim.Region.Physics.OdePlugin
         public void SetTerrain(float[] heightMap, Vector3 pOffset)
         {
            
-            uint regionsize = (uint) Constants.RegionSize;              // visible region size eg. 256(M)
+            int regionsize = (int) Constants.RegionSize;                // visible region size eg. 256(M)
             
-            uint heightmapWidth = regionsize + 1;                               // ODE map size 257 x 257 (Meters) (1 extra 
-            uint heightmapHeight = regionsize + 1;
+            int heightmapWidth = regionsize + 2;                                // ODE map size 258 x 258 (Meters) (1 extra each side)
+            int heightmapHeight = regionsize + 2;
             
-            uint heightmapWidthSamples = (uint)regionsize + 2;          // Sample file size, 258 x 258 samples
-            uint heightmapHeightSamples = (uint)regionsize + 2;
+            int heightmapWidthSamples = (int)regionsize + 3;    // to have 258m we need 259 samples
+            int heightmapHeightSamples = (int)regionsize + 3;
             
             // Array of height samples for ODE 
             float[] _heightmap;
-            _heightmap = new float[(heightmapWidthSamples * heightmapHeightSamples)];   // loaded samples 258 x 258
+            _heightmap = new float[(heightmapWidthSamples * heightmapHeightSamples)];   // loaded samples 259 x 259
 
                         // Other ODE parameters
             const float scale = 1.0f;
@@ -3432,10 +3460,10 @@ namespace OpenSim.Region.Physics.OdePlugin
             float hfmax = -2000f;
             float minele = 0.0f;        // Dont allow -ve heights
             
-            uint x = 0;
-            uint y = 0;
-            uint xx = 0;
-            uint yy = 0;
+            int x = 0;
+            int y = 0;
+            int xx = 0;
+            int yy = 0;
             
             // load the height samples array from the heightMap    
             for ( x = 0; x < heightmapWidthSamples; x++)                                // 0 to 257