diff options
| author | Teravus Ovares (Dan Olivares) | 2009-09-09 16:20:46 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-09-09 16:20:46 -0400 |
| commit | df9f80aabd872c11711e1e4efb400a1921a9cab2 (patch) | |
| tree | a7d5582ed1d763224727c8a6bdf9c1c94a674abd /OpenSim/Region/Physics | |
| parent | * Lock timers when Calling Start() and Stop() when the Thread Context is murk... (diff) | |
| parent | De-hardcode default home locations on create user (standalone). (diff) | |
| download | opensim-SC-df9f80aabd872c11711e1e4efb400a1921a9cab2.zip opensim-SC-df9f80aabd872c11711e1e4efb400a1921a9cab2.tar.gz opensim-SC-df9f80aabd872c11711e1e4efb400a1921a9cab2.tar.bz2 opensim-SC-df9f80aabd872c11711e1e4efb400a1921a9cab2.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index fea288e..94223d8 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
| @@ -3488,7 +3488,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 3488 | { | 3488 | { |
| 3489 | if (geom == localGround) | 3489 | if (geom == localGround) |
| 3490 | { | 3490 | { |
| 3491 | localHeightfield = TerrainHeightFieldHeights[geom]; | 3491 | //localHeightfield = TerrainHeightFieldHeights[geom]; |
| 3492 | proceed = true; | 3492 | proceed = true; |
| 3493 | } | 3493 | } |
| 3494 | else | 3494 | else |
| @@ -3510,7 +3510,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 3510 | // memory corruption | 3510 | // memory corruption |
| 3511 | if (TerrainHeightFieldHeights.ContainsKey(g)) | 3511 | if (TerrainHeightFieldHeights.ContainsKey(g)) |
| 3512 | { | 3512 | { |
| 3513 | float[] removingHeightField = TerrainHeightFieldHeights[g]; | 3513 | //float[] removingHeightField = TerrainHeightFieldHeights[g]; |
| 3514 | TerrainHeightFieldHeights.Remove(g); | 3514 | TerrainHeightFieldHeights.Remove(g); |
| 3515 | 3515 | ||
| 3516 | if (RegionTerrain.ContainsKey(g)) | 3516 | if (RegionTerrain.ContainsKey(g)) |
| @@ -3519,27 +3519,17 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 3519 | } | 3519 | } |
| 3520 | 3520 | ||
| 3521 | d.GeomDestroy(g); | 3521 | d.GeomDestroy(g); |
| 3522 | removingHeightField = new float[0]; | 3522 | //removingHeightField = new float[0]; |
| 3523 | 3523 | } | |
| 3524 | |||
| 3525 | |||
| 3526 | } | ||
| 3527 | |||
| 3528 | } | 3524 | } |
| 3529 | |||
| 3530 | } | 3525 | } |
| 3531 | else | 3526 | else |
| 3532 | { | 3527 | { |
| 3533 | m_log.Warn("[PHYSICS]: Couldn't proceed with UnCombine. Region has inconsistant data."); | 3528 | m_log.Warn("[PHYSICS]: Couldn't proceed with UnCombine. Region has inconsistant data."); |
| 3534 | |||
| 3535 | } | 3529 | } |
| 3536 | 3530 | } | |
| 3537 | } | ||
| 3538 | |||
| 3539 | } | 3531 | } |
| 3540 | } | 3532 | } |
| 3541 | |||
| 3542 | |||
| 3543 | 3533 | ||
| 3544 | public override void SetWaterLevel(float baseheight) | 3534 | public override void SetWaterLevel(float baseheight) |
| 3545 | { | 3535 | { |