aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
diff options
context:
space:
mode:
authorMelanie2009-10-01 14:08:15 +0100
committerMelanie2009-10-01 14:08:15 +0100
commit41ff39414bc70ef645e2180693792c83d61a7539 (patch)
treedc711428d4c8fed07791263ff4dfea142d54e4e7 /OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
parentMerge branch 'vehicles' of ssh://opensim@tor.k-grid.com/home/opensim/opensim ... (diff)
parent- adding new LandDataSerializer testcase to "test-xml" target as well (diff)
downloadopensim-SC_OLD-41ff39414bc70ef645e2180693792c83d61a7539.zip
opensim-SC_OLD-41ff39414bc70ef645e2180693792c83d61a7539.tar.gz
opensim-SC_OLD-41ff39414bc70ef645e2180693792c83d61a7539.tar.bz2
opensim-SC_OLD-41ff39414bc70ef645e2180693792c83d61a7539.tar.xz
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/OdePlugin.cs')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs14
1 files changed, 3 insertions, 11 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index b7afa27..06bae5a 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -2538,7 +2538,7 @@ namespace OpenSim.Region.Physics.OdePlugin
2538 2538
2539 if (iPropertiesNotSupportedDefault == 0) 2539 if (iPropertiesNotSupportedDefault == 0)
2540 { 2540 {
2541#if SPAM 2541#if SPAM
2542 m_log.Warn("NonMesh"); 2542 m_log.Warn("NonMesh");
2543#endif 2543#endif
2544 return false; 2544 return false;
@@ -3346,7 +3346,7 @@ namespace OpenSim.Region.Physics.OdePlugin
3346 { 3346 {
3347 // this._heightmap[i] = (double)heightMap[i]; 3347 // this._heightmap[i] = (double)heightMap[i];
3348 // dbm (danx0r) -- creating a buffer zone of one extra sample all around 3348 // dbm (danx0r) -- creating a buffer zone of one extra sample all around
3349 //_origheightmap = heightMap; 3349 //_origheightmap = heightMap;
3350 3350
3351 float[] _heightmap; 3351 float[] _heightmap;
3352 3352
@@ -3531,12 +3531,8 @@ namespace OpenSim.Region.Physics.OdePlugin
3531 } 3531 }
3532 3532
3533 d.GeomDestroy(g); 3533 d.GeomDestroy(g);
3534 removingHeightField = new float[0]; 3534 //removingHeightField = new float[0];
3535
3536
3537
3538 } 3535 }
3539
3540 } 3536 }
3541 3537
3542 } 3538 }
@@ -3545,14 +3541,10 @@ namespace OpenSim.Region.Physics.OdePlugin
3545 m_log.Warn("[PHYSICS]: Couldn't proceed with UnCombine. Region has inconsistant data."); 3541 m_log.Warn("[PHYSICS]: Couldn't proceed with UnCombine. Region has inconsistant data.");
3546 3542
3547 } 3543 }
3548
3549 } 3544 }
3550
3551 } 3545 }
3552 } 3546 }
3553 3547
3554
3555
3556 public override void SetWaterLevel(float baseheight) 3548 public override void SetWaterLevel(float baseheight)
3557 { 3549 {
3558 waterlevel = baseheight; 3550 waterlevel = baseheight;