diff options
author | UbitUmarov | 2012-04-22 03:08:47 +0100 |
---|---|---|
committer | UbitUmarov | 2012-04-22 03:08:47 +0100 |
commit | 26fd1e3a0c77a5b88429513b47cdd6d16d5867f5 (patch) | |
tree | dcc05e0b07e719b8d091564f5c3ec6b670035235 /OpenSim | |
parent | ubitODE: - don't try to hover underground unless volumedetector (that doesn't... (diff) | |
download | opensim-SC-26fd1e3a0c77a5b88429513b47cdd6d16d5867f5.zip opensim-SC-26fd1e3a0c77a5b88429513b47cdd6d16d5867f5.tar.gz opensim-SC-26fd1e3a0c77a5b88429513b47cdd6d16d5867f5.tar.bz2 opensim-SC-26fd1e3a0c77a5b88429513b47cdd6d16d5867f5.tar.xz |
fix a bug i added fixing another....
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 1211792..108b044 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -753,9 +753,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
753 | if (m_movementAnimationUpdateCounter >= 2) | 753 | if (m_movementAnimationUpdateCounter >= 2) |
754 | { | 754 | { |
755 | m_movementAnimationUpdateCounter = 0; | 755 | m_movementAnimationUpdateCounter = 0; |
756 | if (Animator != null && ParentID == 0) // skip it if sitting | 756 | if (Animator != null) |
757 | { | 757 | { |
758 | Animator.UpdateMovementAnimations(); | 758 | if(ParentID == 0) // skip it if sitting |
759 | Animator.UpdateMovementAnimations(); | ||
759 | } | 760 | } |
760 | else | 761 | else |
761 | { | 762 | { |
@@ -1400,6 +1401,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1400 | { | 1401 | { |
1401 | // Vector3 posAdjusted = m_pos + HEAD_ADJUSTMENT; | 1402 | // Vector3 posAdjusted = m_pos + HEAD_ADJUSTMENT; |
1402 | // m_scene.PhysicsScene.RaycastWorld(m_pos, Vector3.Normalize(CameraPosition - posAdjusted), Vector3.Distance(CameraPosition, posAdjusted) + 0.3f, RayCastCameraCallback); | 1403 | // m_scene.PhysicsScene.RaycastWorld(m_pos, Vector3.Normalize(CameraPosition - posAdjusted), Vector3.Distance(CameraPosition, posAdjusted) + 0.3f, RayCastCameraCallback); |
1404 | |||
1403 | Vector3 posAdjusted = AbsolutePosition + HEAD_ADJUSTMENT; | 1405 | Vector3 posAdjusted = AbsolutePosition + HEAD_ADJUSTMENT; |
1404 | Vector3 distTocam = CameraPosition - posAdjusted; | 1406 | Vector3 distTocam = CameraPosition - posAdjusted; |
1405 | float distTocamlen = distTocam.Length(); | 1407 | float distTocamlen = distTocam.Length(); |
@@ -1408,6 +1410,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1408 | distTocam *= 1.0f / distTocamlen; | 1410 | distTocam *= 1.0f / distTocamlen; |
1409 | m_scene.PhysicsScene.RaycastWorld(posAdjusted, distTocam, distTocamlen + 0.3f, RayCastCameraCallback); | 1411 | m_scene.PhysicsScene.RaycastWorld(posAdjusted, distTocam, distTocamlen + 0.3f, RayCastCameraCallback); |
1410 | } | 1412 | } |
1413 | |||
1411 | } | 1414 | } |
1412 | } | 1415 | } |
1413 | 1416 | ||