aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorRobert Adams2013-12-05 21:07:44 -0800
committerRobert Adams2013-12-05 21:07:44 -0800
commit4eb52eb19e2bd18ad5dc56a06600fa966f3190a3 (patch)
tree4c6428c00023c4668ef516d1e44ee576fabb3721 /OpenSim/Region/Framework/Scenes
parentMerge branch 'master' into varregion (diff)
parentAdding profile partners fix to SQLite and PgSQL drivers (diff)
downloadopensim-SC_OLD-4eb52eb19e2bd18ad5dc56a06600fa966f3190a3.zip
opensim-SC_OLD-4eb52eb19e2bd18ad5dc56a06600fa966f3190a3.tar.gz
opensim-SC_OLD-4eb52eb19e2bd18ad5dc56a06600fa966f3190a3.tar.bz2
opensim-SC_OLD-4eb52eb19e2bd18ad5dc56a06600fa966f3190a3.tar.xz
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 7ae9be5..8eb6f7d 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1645,12 +1645,13 @@ namespace OpenSim.Region.Framework.Scenes
1645 1645
1646 if (AllowMovement && !SitGround) 1646 if (AllowMovement && !SitGround)
1647 { 1647 {
1648 Quaternion bodyRotation = agentData.BodyRotation; 1648// m_log.DebugFormat("[SCENE PRESENCE]: Initial body rotation {0} for {1}", agentData.BodyRotation, Name);
1649
1649 bool update_rotation = false; 1650 bool update_rotation = false;
1650 1651
1651 if (bodyRotation != Rotation) 1652 if (agentData.BodyRotation != Rotation)
1652 { 1653 {
1653 Rotation = bodyRotation; 1654 Rotation = agentData.BodyRotation;
1654 update_rotation = true; 1655 update_rotation = true;
1655 } 1656 }
1656 1657