diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-02-04 15:56:46 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-02-04 15:56:46 -0500 |
| commit | 20c49c78483e7608242b8f34bfc71fbf40837494 (patch) | |
| tree | 443bcc6db9f068ac757a2a4f50948bc7a3114376 /indra/newview/lldriverparam.h | |
| parent | 21adf86c567d3cad81e762c0215c8ec8f8c5eab6 (diff) | |
| parent | 303b84c533d2c6ec7426252915661214ff883f01 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/lldriverparam.h')
| -rw-r--r-- | indra/newview/lldriverparam.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/lldriverparam.h b/indra/newview/lldriverparam.h index 4e2daf5ba7..e963a2d55a 100644 --- a/indra/newview/lldriverparam.h +++ b/indra/newview/lldriverparam.h @@ -34,6 +34,7 @@ #define LL_LLDRIVERPARAM_H #include "llviewervisualparam.h" +#include "llwearabledictionary.h" class LLVOAvatar; class LLWearable; @@ -93,6 +94,7 @@ public: void setWearable(LLWearable *wearablep); void setAvatar(LLVOAvatar *avatarp); + void updateCrossDrivenParams(EWearableType driven_type); /*virtual*/ LLViewerVisualParam* cloneParam(LLWearable* wearable) const; @@ -112,6 +114,7 @@ public: /*virtual*/ LLVector3 getVertexDistortion(S32 index, LLPolyMesh *poly_mesh); /*virtual*/ const LLVector3* getFirstDistortion(U32 *index, LLPolyMesh **poly_mesh); /*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 upload_bake); |