diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index fa6945c..712ec70 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -492,7 +492,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
492 | PhysicsActor actor = m_physicsActor; | 492 | PhysicsActor actor = m_physicsActor; |
493 | // if (actor != null) | 493 | // if (actor != null) |
494 | if ((actor != null) && (m_parentID == 0)) // KF Do NOT update m_pos here if Av is sitting! | 494 | if ((actor != null) && (m_parentID == 0)) // KF Do NOT update m_pos here if Av is sitting! |
495 | { | ||
495 | m_pos = actor.Position; | 496 | m_pos = actor.Position; |
497 | } | ||
496 | else | 498 | else |
497 | { | 499 | { |
498 | // Obtain the correct position of a seated avatar. | 500 | // Obtain the correct position of a seated avatar. |
@@ -540,16 +542,20 @@ namespace OpenSim.Region.Framework.Scenes | |||
540 | } | 542 | } |
541 | } | 543 | } |
542 | 544 | ||
543 | if (m_parentID == 0) // KF Do NOT update m_pos here if Av is sitting! | 545 | // Changed this to update unconditionally to make npose work |
546 | // if (m_parentID == 0) // KF Do NOT update m_pos here if Av is sitting! | ||
544 | m_pos = value; | 547 | m_pos = value; |
545 | m_parentPosition = Vector3.Zero; | 548 | m_parentPosition = Vector3.Zero; |
549 | |||
550 | // m_log.DebugFormat( | ||
551 | // "[ENTITY BASE]: In {0} set AbsolutePosition of {1} to {2}", | ||
552 | // Scene.RegionInfo.RegionName, Name, m_pos); | ||
546 | } | 553 | } |
547 | } | 554 | } |
548 | 555 | ||
549 | public Vector3 OffsetPosition | 556 | public Vector3 OffsetPosition |
550 | { | 557 | { |
551 | get { return m_pos; } | 558 | get { return m_pos; } |
552 | set { m_pos = value; } | ||
553 | } | 559 | } |
554 | 560 | ||
555 | /// <summary> | 561 | /// <summary> |
@@ -582,6 +588,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
582 | } | 588 | } |
583 | 589 | ||
584 | m_velocity = value; | 590 | m_velocity = value; |
591 | |||
592 | // m_log.DebugFormat( | ||
593 | // "[SCENE PRESENCE]: In {0} set velocity of {1} to {2}", | ||
594 | // Scene.RegionInfo.RegionName, Name, m_velocity); | ||
585 | } | 595 | } |
586 | } | 596 | } |
587 | 597 | ||
@@ -4340,4 +4350,4 @@ namespace OpenSim.Region.Framework.Scenes | |||
4340 | } | 4350 | } |
4341 | } | 4351 | } |
4342 | } | 4352 | } |
4343 | } \ No newline at end of file | 4353 | } |