diff options
| author | Melanie | 2012-12-28 08:32:34 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-28 08:32:34 +0000 |
| commit | 3ab1bd04031ca0bc1039e4e1d267ea19d0017430 (patch) | |
| tree | 3f2417f3b96e151642158d29d1982dee2bd850a8 /OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: correct collision mask definition for linkset children. (diff) | |
| download | opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.zip opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.gz opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.bz2 opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs b/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs index 9e1a9ba..817a5f7 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs | |||
| @@ -241,8 +241,8 @@ public class BSVMotor : BSMotor | |||
| 241 | 241 | ||
| 242 | public override string ToString() | 242 | public override string ToString() |
| 243 | { | 243 | { |
| 244 | return String.Format("<{0},curr={1},targ={2},decayTS={3},frictTS={4}>", | 244 | return String.Format("<{0},curr={1},targ={2},lastErr={3},decayTS={4},frictTS={5}>", |
| 245 | UseName, CurrentValue, TargetValue, TargetValueDecayTimeScale, FrictionTimescale); | 245 | UseName, CurrentValue, TargetValue, LastError, TargetValueDecayTimeScale, FrictionTimescale); |
| 246 | } | 246 | } |
| 247 | } | 247 | } |
| 248 | 248 | ||