diff options
| author | Melanie | 2009-10-07 06:56:00 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-07 06:56:00 +0100 |
| commit | d06c7d90a167c1bc9cf71f17d2d40ad84ec1fe10 (patch) | |
| tree | 08191ed58eb504bfaa7aa275588bd89604a050d4 | |
| parent | Merge branch 'master' into vehicles (diff) | |
| download | opensim-SC-d06c7d90a167c1bc9cf71f17d2d40ad84ec1fe10.zip opensim-SC-d06c7d90a167c1bc9cf71f17d2d40ad84ec1fe10.tar.gz opensim-SC-d06c7d90a167c1bc9cf71f17d2d40ad84ec1fe10.tar.bz2 opensim-SC-d06c7d90a167c1bc9cf71f17d2d40ad84ec1fe10.tar.xz | |
Correct a build break caused by an optimization in trunk
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index c02b123..57e1349 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 | public override void UnCombine(PhysicsScene pScene) | 3488 | public override void UnCombine(PhysicsScene pScene) |
| 3489 | { | 3489 | { |
| 3490 | IntPtr localGround = IntPtr.Zero; | 3490 | IntPtr localGround = IntPtr.Zero; |
| 3491 | //float[] localHeightfield; | 3491 | float[] localHeightfield; |
| 3492 | bool proceed = false; | 3492 | bool proceed = false; |
| 3493 | List<IntPtr> geomDestroyList = new List<IntPtr>(); | 3493 | List<IntPtr> geomDestroyList = new List<IntPtr>(); |
| 3494 | 3494 | ||