diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-10-21 21:37:27 +0000 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-10-21 21:37:27 +0000 |
| commit | 5164ed388c1e328cb80dec304ba2fd249ef662f4 (patch) | |
| tree | df6f0f691faa1fae32f376a7b0c582127b7f2507 /indra/newview/lldriverparam.cpp | |
| parent | b3d1eb82fadbf3a098abb49d2ef23cade4c6fe95 (diff) | |
Code audit for r136515 ("merging in new wearable infrastructure...")
No expected functionality change; this mostly contains cosmetic cleanup.
Reviewed by: Nyx
Diffstat (limited to 'indra/newview/lldriverparam.cpp')
| -rw-r--r-- | indra/newview/lldriverparam.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/indra/newview/lldriverparam.cpp b/indra/newview/lldriverparam.cpp index e7295512c1..45f4b4fbd0 100644 --- a/indra/newview/lldriverparam.cpp +++ b/indra/newview/lldriverparam.cpp @@ -156,13 +156,17 @@ void LLDriverParamInfo::toStream(std::ostream &out) // LLDriverParam //----------------------------------------------------------------------------- -LLDriverParam::LLDriverParam(LLVOAvatar *avatarp) - : mCurrentDistortionParam( NULL ), mAvatarp(avatarp), mWearablep(NULL) +LLDriverParam::LLDriverParam(LLVOAvatar *avatarp) : + mCurrentDistortionParam( NULL ), + mAvatarp(avatarp), + mWearablep(NULL) { } -LLDriverParam::LLDriverParam(LLWearable *wearablep) - : mCurrentDistortionParam( NULL ), mAvatarp(NULL), mWearablep(wearablep) +LLDriverParam::LLDriverParam(LLWearable *wearablep) : + mCurrentDistortionParam( NULL ), + mAvatarp(NULL), + mWearablep(wearablep) { } @@ -201,7 +205,7 @@ void LLDriverParam::setAvatar(LLVOAvatar *avatarp) } } -/*virtual*/ LLViewerVisualParam * LLDriverParam::cloneParam(LLWearable* wearable) const +/*virtual*/ LLViewerVisualParam* LLDriverParam::cloneParam(LLWearable* wearable) const { LLDriverParam *new_param; if (wearable) @@ -481,7 +485,7 @@ void LLDriverParam::stopAnimating(BOOL set_by_user) } /*virtual*/ -BOOL LLDriverParam::linkDrivenParams(visual_param_mapper mapper, bool only_cross_params) +BOOL LLDriverParam::linkDrivenParams(visual_param_mapper mapper, BOOL only_cross_params) { BOOL success = TRUE; LLDriverParamInfo::entry_info_list_t::iterator iter; @@ -584,7 +588,8 @@ F32 LLDriverParam::getDrivenWeight(const LLDrivenEntry* driven, F32 input_weight void LLDriverParam::setDrivenWeight(LLDrivenEntry *driven, F32 driven_weight, bool set_by_user) { LLVOAvatarSelf *avatar_self = gAgent.getAvatarObject(); - if(mWearablep && driven->mParam->getCrossWearable() && + if(mWearablep && + driven->mParam->getCrossWearable() && mWearablep->isOnTop()) { // call setWeight through LLVOAvatarSelf so other wearables can be updated with the correct values |