From 4c33328906981f76784b472a36b1007ad8eb264c Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Mon, 18 Feb 2013 17:57:40 -0500
Subject: [PATCH] If RLVa is off, RLVa z offset should not be enforced.

Easier diff view without space changes.
---
 indra/newview/llagent.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 2539c8f91..6d6c6be58 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -4460,9 +4460,14 @@ void LLAgent::sendAgentSetAppearance()
 	body_size.mV[VX] += x_off;
 	body_size.mV[VY] += y_off;
 // [RLVa:KB] - Checked: 2010-10-11 (RLVa-1.2.0e) | Added: RLVa-1.2.0e
-	F32 rlvz_off = RlvSettings::getAvatarOffsetZ();
-	body_size.mV[VZ] += fabs(rlvz_off) ? rlvz_off : z_off;
+	if (rlv_handler_t::isEnabled())
+	{
+		F32 rlvz_off = RlvSettings::getAvatarOffsetZ();
+		body_size.mV[VZ] += fabs(rlvz_off) ? rlvz_off : z_off;
+	}
+	else
 // [/RLVa:KB]
+		body_size.mV[VZ] += z_off;
 
 	msg->addVector3Fast(_PREHASH_Size, body_size);