aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2011-10-11 22:12:25 +0100
committerMelanie2011-10-11 22:12:25 +0100
commit341efb09420ff917e84e5342dd044611f22e8535 (patch)
tree45aaa42d946dcc671c9749aa6376ee8b59435e44 /OpenSim/Region/Framework/Scenes
parentMerge commit 'adfe713b4340771eee15371dd1216527b5662545' into bigmerge (diff)
parentStop the avatar stalling on its first boarder cross when using the ODE plugin (diff)
downloadopensim-SC_OLD-341efb09420ff917e84e5342dd044611f22e8535.zip
opensim-SC_OLD-341efb09420ff917e84e5342dd044611f22e8535.tar.gz
opensim-SC_OLD-341efb09420ff917e84e5342dd044611f22e8535.tar.bz2
opensim-SC_OLD-341efb09420ff917e84e5342dd044611f22e8535.tar.xz
Merge commit '6f542f73d4aacc0b92c2ebcff84b4ce2c8d9433b' into bigmerge
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs10
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index bc6458f..697a9f8 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -494,6 +494,10 @@ namespace OpenSim.Region.Framework.Scenes
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 {
496 m_pos = actor.Position; 496 m_pos = actor.Position;
497
498// m_log.DebugFormat(
499// "[SCENE PRESENCE]: Set position {0} for {1} in {2} via getting AbsolutePosition!",
500// m_pos, Name, Scene.RegionInfo.RegionName);
497 } 501 }
498 else 502 else
499 { 503 {
@@ -571,8 +575,14 @@ namespace OpenSim.Region.Framework.Scenes
571 { 575 {
572 PhysicsActor actor = m_physicsActor; 576 PhysicsActor actor = m_physicsActor;
573 if (actor != null) 577 if (actor != null)
578 {
574 m_velocity = actor.Velocity; 579 m_velocity = actor.Velocity;
575 580
581// m_log.DebugFormat(
582// "[SCENE PRESENCE]: Set velocity {0} for {1} in {2} via getting Velocity!",
583// m_velocity, Name, Scene.RegionInfo.RegionName);
584 }
585
576 return m_velocity; 586 return m_velocity;
577 } 587 }
578 set 588 set