diff options
author | John Hurliman | 2009-10-22 13:14:41 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-22 13:14:41 -0700 |
commit | 167d8e39fa34c52593c640058287184026c95288 (patch) | |
tree | d1f2032d06ae16128653bee612dca4cd956451cb /OpenSim | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-167d8e39fa34c52593c640058287184026c95288.zip opensim-SC_OLD-167d8e39fa34c52593c640058287184026c95288.tar.gz opensim-SC_OLD-167d8e39fa34c52593c640058287184026c95288.tar.bz2 opensim-SC_OLD-167d8e39fa34c52593c640058287184026c95288.tar.xz |
* Sending (position - hipoffset) instead of position
* Sending m_rotation instead of m_bodyRot in full updates to match terse updates (no idea which one is right!)
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index d7113bf..99fd86c 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2517,15 +2517,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
2517 | if (m_appearance.Texture == null) | 2517 | if (m_appearance.Texture == null) |
2518 | return; | 2518 | return; |
2519 | 2519 | ||
2520 | // Note: because Quaternion is a struct, it can't be null | ||
2521 | Quaternion rot = m_bodyRot; | ||
2522 | |||
2523 | Vector3 pos = m_pos; | 2520 | Vector3 pos = m_pos; |
2524 | pos.Z -= m_appearance.HipOffset; | 2521 | pos.Z -= m_appearance.HipOffset; |
2525 | 2522 | ||
2526 | remoteAvatar.m_controllingClient.SendAvatarData(new SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, | 2523 | remoteAvatar.m_controllingClient.SendAvatarData(new SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, |
2527 | LocalId, m_pos, m_appearance.Texture.GetBytes(), | 2524 | LocalId, pos, m_appearance.Texture.GetBytes(), |
2528 | m_parentID, rot)); | 2525 | m_parentID, m_bodyRot)); |
2529 | m_scene.StatsReporter.AddAgentUpdates(1); | 2526 | m_scene.StatsReporter.AddAgentUpdates(1); |
2530 | } | 2527 | } |
2531 | 2528 | ||