aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcharacter/llvisualparam.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:56 -0500
committerJacek Antonelli2008-08-15 23:44:56 -0500
commitc07901e29ed545bbb02e3bddf148fe1104b94e9f (patch)
treef1ada64ce834acd7d92a425efb96c4b86bcf16b1 /linden/indra/llcharacter/llvisualparam.cpp
parentSecond Life viewer sources 1.15.0.2 (diff)
downloadmeta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.zip
meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.gz
meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.bz2
meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.xz
Second Life viewer sources 1.15.1.3
Diffstat (limited to '')
-rw-r--r--linden/indra/llcharacter/llvisualparam.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/linden/indra/llcharacter/llvisualparam.cpp b/linden/indra/llcharacter/llvisualparam.cpp
index de163eb..d1c08f9 100644
--- a/linden/indra/llcharacter/llvisualparam.cpp
+++ b/linden/indra/llcharacter/llvisualparam.cpp
@@ -232,16 +232,16 @@ void LLVisualParam::setWeight(F32 weight, BOOL set_by_user)
232//----------------------------------------------------------------------------- 232//-----------------------------------------------------------------------------
233void LLVisualParam::setAnimationTarget(F32 target_value, BOOL set_by_user) 233void LLVisualParam::setAnimationTarget(F32 target_value, BOOL set_by_user)
234{ 234{
235 if (getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE) 235 if (mInfo)
236 { 236 {
237 if (mInfo) 237 if (getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE)
238 { 238 {
239 mTargetWeight = llclamp(target_value, mInfo->mMinWeight, mInfo->mMaxWeight); 239 mTargetWeight = llclamp(target_value, mInfo->mMinWeight, mInfo->mMaxWeight);
240 } 240 }
241 else 241 }
242 { 242 else
243 mTargetWeight = target_value; 243 {
244 } 244 mTargetWeight = target_value;
245 } 245 }
246 mIsAnimating = TRUE; 246 mIsAnimating = TRUE;
247 247