summaryrefslogtreecommitdiff
path: root/indra/newview/lldriverparam.h
diff options
context:
space:
mode:
authorYchebotarev ProductEngine <ychebotarev@productengine.com>2010-02-05 17:50:26 +0200
committerYchebotarev ProductEngine <ychebotarev@productengine.com>2010-02-05 17:50:26 +0200
commit166ac89de9bcf951103cbf2551a133ebe9e43035 (patch)
tree21f23a3841592edef65f940274b5b59b662e2ba6 /indra/newview/lldriverparam.h
parentac8753a7eaab05b47d7da6e5ae8ef5f3aa324273 (diff)
parent77b5a39cc1daa79ceea599aea3f680127c9949b1 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/lldriverparam.h')
-rw-r--r--indra/newview/lldriverparam.h3
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);