Merge branch 'master' into careminster

2026-08-11 11:57:03 +08:00 · 2012-11-09 22:58:42 +00:00
parent b3e99a4d48 64c80aec64
commit 415b89f434
13 changed files with 300 additions and 62 deletions
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -661,6 +661,20 @@ namespace OpenSim.Region.Physics.OdePlugin
            set { return; }
        }

+        public override Vector3 TargetVelocity
+        {
+            get
+            {
+                return m_taintTargetVelocity;
+            }
+
+            set
+            {
+                Velocity = value;
+            }
+        }
+
+
        public override Vector3 Velocity
        {
            get
@@ -1394,4 +1408,4 @@ namespace OpenSim.Region.Physics.OdePlugin
            m_eventsubscription += p;
        }
    }
-}
+}