diff options
| author | Melanie | 2011-10-12 01:41:44 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-12 01:41:44 +0100 |
| commit | b0ee174296b50450746fd0fbc839f7078609f100 (patch) | |
| tree | cdcb2d29bf3a8294ff95ea42d49c14e0ee7a408d /OpenSim/Region | |
| parent | Merge commit '7d033187d8fd49d9a38531061c38783e81d69f5b' into bigmerge (diff) | |
| parent | Remove unused local variable i from OdeScene.Simulate() (diff) | |
| download | opensim-SC-b0ee174296b50450746fd0fbc839f7078609f100.zip opensim-SC-b0ee174296b50450746fd0fbc839f7078609f100.tar.gz opensim-SC-b0ee174296b50450746fd0fbc839f7078609f100.tar.bz2 opensim-SC-b0ee174296b50450746fd0fbc839f7078609f100.tar.xz | |
Merge commit '9090039324ecc45bf1005e719f61a80f0187cb73' into bigmerge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 6e603e8..2da922b 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
| @@ -2651,8 +2651,6 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name); | |||
| 2651 | //base.TriggerPhysicsBasedRestart(); | 2651 | //base.TriggerPhysicsBasedRestart(); |
| 2652 | //} | 2652 | //} |
| 2653 | 2653 | ||
| 2654 | int i = 0; | ||
| 2655 | |||
| 2656 | // Figure out the Frames Per Second we're going at. | 2654 | // Figure out the Frames Per Second we're going at. |
| 2657 | //(step_time == 0.004f, there's 250 of those per second. Times the step time/step size | 2655 | //(step_time == 0.004f, there's 250 of those per second. Times the step time/step size |
| 2658 | 2656 | ||
| @@ -2810,7 +2808,6 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name); | |||
| 2810 | } | 2808 | } |
| 2811 | 2809 | ||
| 2812 | step_time -= ODE_STEPSIZE; | 2810 | step_time -= ODE_STEPSIZE; |
| 2813 | i++; | ||
| 2814 | //} | 2811 | //} |
| 2815 | //else | 2812 | //else |
| 2816 | //{ | 2813 | //{ |