diff options
author | Melanie | 2012-11-09 22:58:42 +0000 |
---|---|---|
committer | Melanie | 2012-11-09 22:58:42 +0000 |
commit | 415b89f434657fe4cbf62a5c99f24c2648a313ac (patch) | |
tree | 48d7e97cc64a4351755942745a9a8f65d52b5322 /OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | llSetLinkCamera implementation (diff) | |
download | opensim-SC-415b89f434657fe4cbf62a5c99f24c2648a313ac.zip opensim-SC-415b89f434657fe4cbf62a5c99f24c2648a313ac.tar.gz opensim-SC-415b89f434657fe4cbf62a5c99f24c2648a313ac.tar.bz2 opensim-SC-415b89f434657fe4cbf62a5c99f24c2648a313ac.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODECharacter.cs')
-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 | } |