Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

1 files changed, 2 insertions, 5 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 0769c90..f5ab1de 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -3476,7 +3476,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         public override void UnCombine(PhysicsScene pScene)
         {
             IntPtr localGround = IntPtr.Zero;
-            float[] localHeightfield;
+            //float[] localHeightfield;
             bool proceed = false;
             List<IntPtr> geomDestroyList = new List<IntPtr>();
 
@@ -3771,16 +3771,13 @@ namespace OpenSim.Region.Physics.OdePlugin
                         sides.Z = 0.5f;
 
                         ds.DrawBox(ref pos, ref R, ref sides);
-
-
                     }
                 }
             }
         }
 
         public void start(int unused)
-        {
-            
+        {            
             ds.SetViewpoint(ref xyz, ref hpr);
         }
 #endif