From 54c1fcf33db5cb6f369c57fd5e839d62a7461028 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 6 Feb 2013 22:41:10 -0500
Subject: [PATCH] Override the viewer's Z offset with the RLV one, if the RLV
 one has been set.

---
 indra/newview/llagent.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 8f412d0b8..2539c8f91 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -4459,9 +4459,9 @@ void LLAgent::sendAgentSetAppearance()
 
 	body_size.mV[VX] += x_off;
 	body_size.mV[VY] += y_off;
-	body_size.mV[VZ] += z_off; // Offset by RLVa, but not overridden.
 // [RLVa:KB] - Checked: 2010-10-11 (RLVa-1.2.0e) | Added: RLVa-1.2.0e
-	body_size.mV[VZ] += RlvSettings::getAvatarOffsetZ();
+	F32 rlvz_off = RlvSettings::getAvatarOffsetZ();
+	body_size.mV[VZ] += fabs(rlvz_off) ? rlvz_off : z_off;
 // [/RLVa:KB]
 
 	msg->addVector3Fast(_PREHASH_Size, body_size);