From 26e18c6448ff36cef236721d2568ba032eeeae4f Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 9 Apr 2015 11:34:42 +0200
Subject: [PATCH] Make sure we always get the offset right on SL

---
 indra/newview/llvoavatarself.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 6d2e495ed7..e2473ddd1e 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -3308,7 +3308,13 @@ void LLVOAvatarSelf::dumpWearableInfo(LLAPRFile& outfile)
 // [RLVa:KB] - Checked: 2013-03-03 (RLVa-1.4.8)
 F32 LLVOAvatarSelf::getAvatarOffset() /*const*/
 {
-	return (isUsingServerBakes()) ? LLAvatarAppearance::getAvatarOffset() : gSavedPerAccountSettings.getF32("AvatarHoverOffsetZ");
+#ifdef OPENSIM
+	if (!LLGridManager::getInstance()->isInSecondLife())
+	{
+		return (isUsingServerBakes()) ? LLAvatarAppearance::getAvatarOffset() : gSavedPerAccountSettings.getF32("AvatarHoverOffsetZ");
+	}
+#endif
+	return LLAvatarAppearance::getAvatarOffset();
 }
 // [/RLVa:KB]