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]