diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-05-02 17:37:29 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-05-02 17:37:29 -0700 |
| commit | 2a7d604e87df5a48bfb0abeb0d7b897a117005fb (patch) | |
| tree | 783a46ee6f16e484ac35b933bace359b2eb2d1b8 /indra/llcharacter/llvisualparam.h | |
| parent | cc7440d0853d269a5b955ab021db729ed5b6a92c (diff) | |
| parent | 043f2e0bfd40d29464175de838e3a36aad6e81df (diff) | |
ACME-306 : Pull merge from viewer-chui
Diffstat (limited to 'indra/llcharacter/llvisualparam.h')
| -rw-r--r-- | indra/llcharacter/llvisualparam.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/llcharacter/llvisualparam.h b/indra/llcharacter/llvisualparam.h index 281fb14781..60ea7a369a 100644 --- a/indra/llcharacter/llvisualparam.h +++ b/indra/llcharacter/llvisualparam.h @@ -50,6 +50,16 @@ enum EVisualParamGroup NUM_VISUAL_PARAM_GROUPS }; +enum EParamLocation +{ + LOC_UNKNOWN, + LOC_AV_SELF, + LOC_AV_OTHER, + LOC_WEARABLE +}; + +const std::string param_location_name(const EParamLocation& loc); + const S32 MAX_TRANSMITTED_VISUAL_PARAMS = 255; //----------------------------------------------------------------------------- @@ -150,6 +160,9 @@ public: void setIsDummy(BOOL is_dummy) { mIsDummy = is_dummy; } + void setParamLocation(EParamLocation loc); + EParamLocation getParamLocation() const { return mParamLocation; } + protected: F32 mCurWeight; // current weight F32 mLastWeight; // last weight @@ -161,6 +174,7 @@ protected: S32 mID; // id for storing weight/morphtarget compares compactly LLVisualParamInfo *mInfo; + EParamLocation mParamLocation; // where does this visual param live? } LL_ALIGN_POSTFIX(16); #endif // LL_LLVisualParam_H |