From 1c909afe3998778e4cc045c9ab733e8afbf7c25b Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Wed, 2 May 2007 21:24:47 +0000
Subject: svn merge -r 60342:61148
 svn+ssh://svn/svn/linden/branches/maintenance into release

---
 indra/llcharacter/llvisualparam.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/llcharacter/llvisualparam.cpp')

diff --git a/indra/llcharacter/llvisualparam.cpp b/indra/llcharacter/llvisualparam.cpp
index a6fd9b974f..e29800ee4a 100644
--- a/indra/llcharacter/llvisualparam.cpp
+++ b/indra/llcharacter/llvisualparam.cpp
@@ -212,16 +212,16 @@ void LLVisualParam::setWeight(F32 weight, BOOL set_by_user)
 //-----------------------------------------------------------------------------
 void LLVisualParam::setAnimationTarget(F32 target_value, BOOL set_by_user)
 {
-	if (getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE)
+	if (mInfo)
 	{
-		if (mInfo)
+		if (getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE)
 		{
 			mTargetWeight = llclamp(target_value, mInfo->mMinWeight, mInfo->mMaxWeight);
 		}
-		else
-		{
-			mTargetWeight = target_value;
-		}
+	}
+	else
+	{
+		mTargetWeight = target_value;
 	}
 	mIsAnimating = TRUE;
 
-- 
cgit v1.2.3