diff options
author | Justin Clark-Casey (justincc) | 2011-08-11 02:36:02 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-11 02:36:02 +0100 |
commit | 29093df1a7f3d2816d1b446524b2de18b0b5ac45 (patch) | |
tree | 35d56b0ed14f3538b8fbceaa4ebc284159b9489b /OpenSim/Region/Framework/Scenes | |
parent | only accept npc UUIDs to osNpc* functions, not names (except for create) (diff) | |
download | opensim-SC-29093df1a7f3d2816d1b446524b2de18b0b5ac45.zip opensim-SC-29093df1a7f3d2816d1b446524b2de18b0b5ac45.tar.gz opensim-SC-29093df1a7f3d2816d1b446524b2de18b0b5ac45.tar.bz2 opensim-SC-29093df1a7f3d2816d1b446524b2de18b0b5ac45.tar.xz |
get rid of intermediate local store of body rotation in ScenePresence, this is not used.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 7a30684..e28d1fe 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -173,7 +173,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
173 | 173 | ||
174 | private float m_speedModifier = 1.0f; | 174 | private float m_speedModifier = 1.0f; |
175 | 175 | ||
176 | private Quaternion m_bodyRot= Quaternion.Identity; | 176 | private Quaternion m_bodyRot = Quaternion.Identity; |
177 | 177 | ||
178 | private Quaternion m_bodyRotPrevious = Quaternion.Identity; | 178 | private Quaternion m_bodyRotPrevious = Quaternion.Identity; |
179 | 179 | ||
@@ -1397,7 +1397,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1397 | bool update_rotation = false; | 1397 | bool update_rotation = false; |
1398 | bool DCFlagKeyPressed = false; | 1398 | bool DCFlagKeyPressed = false; |
1399 | Vector3 agent_control_v3 = Vector3.Zero; | 1399 | Vector3 agent_control_v3 = Vector3.Zero; |
1400 | Quaternion q = bodyRotation; | ||
1401 | 1400 | ||
1402 | bool oldflying = PhysicsActor.Flying; | 1401 | bool oldflying = PhysicsActor.Flying; |
1403 | 1402 | ||
@@ -1411,9 +1410,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1411 | if (actor.Flying != oldflying) | 1410 | if (actor.Flying != oldflying) |
1412 | update_movementflag = true; | 1411 | update_movementflag = true; |
1413 | 1412 | ||
1414 | if (q != m_bodyRot) | 1413 | if (bodyRotation != m_bodyRot) |
1415 | { | 1414 | { |
1416 | m_bodyRot = q; | 1415 | m_bodyRot = bodyRotation; |
1417 | update_rotation = true; | 1416 | update_rotation = true; |
1418 | } | 1417 | } |
1419 | 1418 | ||
@@ -1535,7 +1534,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1535 | // m_log.DebugFormat( | 1534 | // m_log.DebugFormat( |
1536 | // "In {0} adding velocity to {1} of {2}", m_scene.RegionInfo.RegionName, Name, agent_control_v3); | 1535 | // "In {0} adding velocity to {1} of {2}", m_scene.RegionInfo.RegionName, Name, agent_control_v3); |
1537 | 1536 | ||
1538 | AddNewMovement(agent_control_v3, q); | 1537 | AddNewMovement(agent_control_v3, bodyRotation); |
1539 | } | 1538 | } |
1540 | 1539 | ||
1541 | if (update_movementflag | 1540 | if (update_movementflag |