From 668a822ace1a7f1dffd090bbdd68712c31d0ac5c Mon Sep 17 00:00:00 2001
From: Nyx Linden <nyx@lindenlab.com>
Date: Fri, 3 May 2013 17:30:36 -0400
Subject: SH-4147 FIX Macro avatars with hover==0 look incorrect on relog
Inverted logic meant that we would enforce minimums only while
in preview renders, not for actual user adjustments. This seems to fix it.
---
indra/newview/llvoavatar.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 3189507b53..e2ed6f54cc 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -5225,7 +5225,7 @@ void LLVOAvatar::computeBodySize()
if (isSelf() && getWearableData())
{
LLViewerWearable* shape = (LLViewerWearable*)getWearableData()->getWearable(LLWearableType::WT_SHAPE, 0);
- if (shape && shape->getVolitile())
+ if (shape && !shape->getVolitile())
{
F32 hover_value = shape->getVisualParamWeight(AVATAR_HOVER);
if (hover_value < 0.0f && (mBodySize.mV[VZ] + hover_value < 1.1f))
--
cgit v1.2.3