aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index 139c4e8..a554897 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -203,9 +203,9 @@ namespace OpenSim.Region.Physics.OdePlugin
203 private float waterlevel = 0f; 203 private float waterlevel = 0f;
204 private int framecount = 0; 204 private int framecount = 0;
205 205
206 private IntPtr WaterGeom = IntPtr.Zero; 206// private IntPtr WaterGeom = IntPtr.Zero;
207 private IntPtr WaterHeightmapData = IntPtr.Zero; 207// private IntPtr WaterHeightmapData = IntPtr.Zero;
208 private GCHandle WaterMapHandler = new GCHandle(); 208// private GCHandle WaterMapHandler = new GCHandle();
209 209
210 public float avPIDD = 2200f; // make it visible 210 public float avPIDD = 2200f; // make it visible
211 public float avPIDP = 900f; // make it visible 211 public float avPIDP = 900f; // make it visible
@@ -2491,9 +2491,9 @@ namespace OpenSim.Region.Physics.OdePlugin
2491 public override void SetWaterLevel(float baseheight) 2491 public override void SetWaterLevel(float baseheight)
2492 { 2492 {
2493 waterlevel = baseheight; 2493 waterlevel = baseheight;
2494 randomizeWater(waterlevel); 2494// randomizeWater(waterlevel);
2495 } 2495 }
2496 2496/*
2497 public void randomizeWater(float baseheight) 2497 public void randomizeWater(float baseheight)
2498 { 2498 {
2499 const uint heightmapWidth = Constants.RegionSize + 2; 2499 const uint heightmapWidth = Constants.RegionSize + 2;
@@ -2574,7 +2574,7 @@ namespace OpenSim.Region.Physics.OdePlugin
2574 } 2574 }
2575 } 2575 }
2576 } 2576 }
2577 2577*/
2578 public override void Dispose() 2578 public override void Dispose()
2579 { 2579 {
2580 lock (OdeLock) 2580 lock (OdeLock)
@@ -2624,7 +2624,7 @@ namespace OpenSim.Region.Physics.OdePlugin
2624 2624
2625 TerrainHeightFieldHeightsHandlers.Clear(); 2625 TerrainHeightFieldHeightsHandlers.Clear();
2626 TerrainHeightFieldHeights.Clear(); 2626 TerrainHeightFieldHeights.Clear();
2627 2627/*
2628 if (WaterGeom != IntPtr.Zero) 2628 if (WaterGeom != IntPtr.Zero)
2629 { 2629 {
2630 d.GeomDestroy(WaterGeom); 2630 d.GeomDestroy(WaterGeom);
@@ -2636,7 +2636,7 @@ namespace OpenSim.Region.Physics.OdePlugin
2636 if (WaterMapHandler.IsAllocated) 2636 if (WaterMapHandler.IsAllocated)
2637 WaterMapHandler.Free(); 2637 WaterMapHandler.Free();
2638 } 2638 }
2639 2639*/
2640 if (ContactgeomsArray != IntPtr.Zero) 2640 if (ContactgeomsArray != IntPtr.Zero)
2641 Marshal.FreeHGlobal(ContactgeomsArray); 2641 Marshal.FreeHGlobal(ContactgeomsArray);
2642 if (GlobalContactsArray != IntPtr.Zero) 2642 if (GlobalContactsArray != IntPtr.Zero)