diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2009-11-13 12:06:52 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2009-11-13 12:06:52 +0200 |
| commit | 1db5d35447478a74ece447297289d76bfef8c48c (patch) | |
| tree | db0b8f78344aee6ed21efd4444908c8c8d0fc7a5 /indra/newview/lldriverparam.h | |
| parent | 4d616fdfaebca4aedce84f5d694dcd495ac4222c (diff) | |
| parent | 74d5a6605bac7ae76889ce3697fc8f59d982d675 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lldriverparam.h')
| -rw-r--r-- | indra/newview/lldriverparam.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/lldriverparam.h b/indra/newview/lldriverparam.h index 069e71a2cb..4e2daf5ba7 100644 --- a/indra/newview/lldriverparam.h +++ b/indra/newview/lldriverparam.h @@ -99,9 +99,9 @@ public: // LLVisualParam Virtual functions ///*virtual*/ BOOL parseData(LLXmlTreeNode* node); /*virtual*/ void apply( ESex sex ) {} // apply is called separately for each driven param. - /*virtual*/ void setWeight(F32 weight, BOOL set_by_user); - /*virtual*/ void setAnimationTarget( F32 target_value, BOOL set_by_user ); - /*virtual*/ void stopAnimating(BOOL set_by_user); + /*virtual*/ void setWeight(F32 weight, BOOL upload_bake); + /*virtual*/ void setAnimationTarget( F32 target_value, BOOL upload_bake ); + /*virtual*/ void stopAnimating(BOOL upload_bake); /*virtual*/ BOOL linkDrivenParams(visual_param_mapper mapper, BOOL only_cross_params); /*virtual*/ void resetDrivenParams(); @@ -114,7 +114,7 @@ public: /*virtual*/ const LLVector3* getNextDistortion(U32 *index, LLPolyMesh **poly_mesh); protected: F32 getDrivenWeight(const LLDrivenEntry* driven, F32 input_weight); - void setDrivenWeight(LLDrivenEntry *driven, F32 driven_weight, bool set_by_user); + void setDrivenWeight(LLDrivenEntry *driven, F32 driven_weight, bool upload_bake); LLVector3 mDefaultVec; // temp holder |