diff options
| author | Dan Lake | 2012-11-08 01:18:25 -0800 |
|---|---|---|
| committer | Dan Lake | 2012-11-08 01:18:25 -0800 |
| commit | 9bc0419679ac8b05cd9b6a5cf340f1e6b8d5d288 (patch) | |
| tree | d4a4016655662ad543795517bd9b547293283302 /OpenSim | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-9bc0419679ac8b05cd9b6a5cf340f1e6b8d5d288.zip opensim-SC-9bc0419679ac8b05cd9b6a5cf340f1e6b8d5d288.tar.gz opensim-SC-9bc0419679ac8b05cd9b6a5cf340f1e6b8d5d288.tar.bz2 opensim-SC-9bc0419679ac8b05cd9b6a5cf340f1e6b8d5d288.tar.xz | |
ODECharacter overrides TargetVelocity. No change to existing behavior
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index c736557..319f6ab 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
| @@ -661,6 +661,20 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 661 | set { return; } | 661 | set { return; } |
| 662 | } | 662 | } |
| 663 | 663 | ||
| 664 | public override Vector3 TargetVelocity | ||
| 665 | { | ||
| 666 | get | ||
| 667 | { | ||
| 668 | return m_taintTargetVelocity; | ||
| 669 | } | ||
| 670 | |||
| 671 | set | ||
| 672 | { | ||
| 673 | Velocity = value; | ||
| 674 | } | ||
| 675 | } | ||
| 676 | |||
| 677 | |||
| 664 | public override Vector3 Velocity | 678 | public override Vector3 Velocity |
| 665 | { | 679 | { |
| 666 | get | 680 | get |
| @@ -1394,4 +1408,4 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1394 | m_eventsubscription += p; | 1408 | m_eventsubscription += p; |
| 1395 | } | 1409 | } |
| 1396 | } | 1410 | } |
| 1397 | } \ No newline at end of file | 1411 | } |