1 files changed, 13 insertions, 0 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 6dd3885..c44c741 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5589,6 +5589,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 velocity = presence.Velocity;
                 acceleration = Vector3.Zero;
                 rotation = presence.Rotation;
+                // tpvs can only see rotations around Z in some cases
+                if(!presence.Flying && !presence.IsSatOnObject)
+                {
+                    rotation.X = 0f;
+                    rotation.Y = 0f;
+                    rotation.Normalize();
+                }
                 angularVelocity = presence.AngularVelocity;
 
 //                m_log.DebugFormat(
@@ -5718,6 +5725,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             Vector3 velocity = new Vector3(0, 0, 0);
             Vector3 acceleration = new Vector3(0, 0, 0);
+            // tpvs can only see rotations around Z in some cases
+            if(!data.Flying && !data.IsSatOnObject)
+            {
+                rotation.X = 0f;
+                rotation.Y = 0f;
+            }
             rotation.Normalize();
 
             data.CollisionPlane.ToBytes(objectData, 0);