diff options
author | Justin Clark-Casey (justincc) | 2011-10-25 21:15:37 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-10-25 21:15:37 +0100 |
commit | 1fbb3795367185da534938c4c90e8558795fba88 (patch) | |
tree | 1324340598c6ba180bc0a957ad16a62a00890894 /OpenSim/Region/Physics/OdePlugin | |
parent | Add new LindenCaps test dll to panda run as well as "nant test" (diff) | |
download | opensim-SC_OLD-1fbb3795367185da534938c4c90e8558795fba88.zip opensim-SC_OLD-1fbb3795367185da534938c4c90e8558795fba88.tar.gz opensim-SC_OLD-1fbb3795367185da534938c4c90e8558795fba88.tar.bz2 opensim-SC_OLD-1fbb3795367185da534938c4c90e8558795fba88.tar.xz |
minor: rename a parameter in OdeScene.Simulate() from actor -> prim since it's an OdePrim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 0810ae0..2b29ce4 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
@@ -2859,14 +2859,14 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name); | |||
2859 | { | 2859 | { |
2860 | //if (timeStep < 0.2f) | 2860 | //if (timeStep < 0.2f) |
2861 | { | 2861 | { |
2862 | foreach (OdePrim actor in _activeprims) | 2862 | foreach (OdePrim prim in _activeprims) |
2863 | { | 2863 | { |
2864 | if (actor.IsPhysical && (d.BodyIsEnabled(actor.Body) || !actor._zeroFlag)) | 2864 | if (prim.IsPhysical && (d.BodyIsEnabled(prim.Body) || !prim._zeroFlag)) |
2865 | { | 2865 | { |
2866 | actor.UpdatePositionAndVelocity(); | 2866 | prim.UpdatePositionAndVelocity(); |
2867 | 2867 | ||
2868 | if (SupportsNINJAJoints) | 2868 | if (SupportsNINJAJoints) |
2869 | SimulateActorPendingJoints(actor); | 2869 | SimulateActorPendingJoints(prim); |
2870 | } | 2870 | } |
2871 | } | 2871 | } |
2872 | } | 2872 | } |