aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2015-03-04 16:35:27 +0000
committerJustin Clark-Casey (justincc)2015-03-04 16:35:27 +0000
commit1a185a048bbe60122fb713d305b85386e43ae6d3 (patch)
treeb7b6a20b0952bd792bcee9907b7228e816ce3cb6 /OpenSim/Region/Physics
parentPrevent null entries being treated as URI's when DataSnapshot service splits ... (diff)
parentFix erratic Npc movement (diff)
downloadopensim-SC_OLD-1a185a048bbe60122fb713d305b85386e43ae6d3.zip
opensim-SC_OLD-1a185a048bbe60122fb713d305b85386e43ae6d3.tar.gz
opensim-SC_OLD-1a185a048bbe60122fb713d305b85386e43ae6d3.tar.bz2
opensim-SC_OLD-1a185a048bbe60122fb713d305b85386e43ae6d3.tar.xz
Merge commit '7e8bad05ec6150e082fb634e3210b83c33dbcfe7' into 0.8.1-post-fixes
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index f5a25d6..f934b8a 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -785,6 +785,14 @@ namespace OpenSim.Region.Physics.OdePlugin
785 } 785 }
786 } 786 }
787 787
788 private void setAngularVelocity(float x, float y, float z)
789 {
790 if (Body != (IntPtr)0)
791 {
792 d.BodySetAngularVel(Body, x, y, z);
793 }
794 }
795
788 /// <summary> 796 /// <summary>
789 /// Stop a prim from being subject to physics. 797 /// Stop a prim from being subject to physics.
790 /// </summary> 798 /// </summary>
@@ -2645,6 +2653,7 @@ Console.WriteLine(" JointCreateFixed");
2645 if (value.IsFinite()) 2653 if (value.IsFinite())
2646 { 2654 {
2647 m_rotationalVelocity = value; 2655 m_rotationalVelocity = value;
2656 setAngularVelocity(value.X, value.Y, value.Z);
2648 } 2657 }
2649 else 2658 else
2650 { 2659 {