aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorteravus2013-02-01 15:42:24 -0500
committerteravus2013-02-01 15:42:24 -0500
commitd8d4e7f236346d8dd7d66dbc187bb5362c00f039 (patch)
tree9c8993940306c9bdfa31d1dbdf1d548cba732769 /OpenSim/Region/Framework/Scenes
parentBulletSim: fix problem where editting a physical linkset caused the (diff)
downloadopensim-SC_OLD-d8d4e7f236346d8dd7d66dbc187bb5362c00f039.zip
opensim-SC_OLD-d8d4e7f236346d8dd7d66dbc187bb5362c00f039.tar.gz
opensim-SC_OLD-d8d4e7f236346d8dd7d66dbc187bb5362c00f039.tar.bz2
opensim-SC_OLD-d8d4e7f236346d8dd7d66dbc187bb5362c00f039.tar.xz
Sit and Spin reduction. If sitting, slam avatar angular velocity to zero.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index e0dfb34..6e41774 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2342,7 +2342,7 @@ namespace OpenSim.Region.Framework.Scenes
2342 2342
2343 ParentPart = m_scene.GetSceneObjectPart(m_requestedSitTargetID); 2343 ParentPart = m_scene.GetSceneObjectPart(m_requestedSitTargetID);
2344 ParentID = m_requestedSitTargetID; 2344 ParentID = m_requestedSitTargetID;
2345 2345 m_AngularVelocity = Vector3.Zero;
2346 Velocity = Vector3.Zero; 2346 Velocity = Vector3.Zero;
2347 RemoveFromPhysicalScene(); 2347 RemoveFromPhysicalScene();
2348 2348
@@ -2358,7 +2358,8 @@ namespace OpenSim.Region.Framework.Scenes
2358 2358
2359 public void HandleAgentSitOnGround() 2359 public void HandleAgentSitOnGround()
2360 { 2360 {
2361// m_updateCount = 0; // Kill animation update burst so that the SIT_G.. will stick. 2361// m_updateCount = 0; // Kill animation update burst so that the SIT_G.. will stick..
2362 m_AngularVelocity = Vector3.Zero;
2362 Animator.TrySetMovementAnimation("SIT_GROUND_CONSTRAINED"); 2363 Animator.TrySetMovementAnimation("SIT_GROUND_CONSTRAINED");
2363 SitGround = true; 2364 SitGround = true;
2364 RemoveFromPhysicalScene(); 2365 RemoveFromPhysicalScene();