diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-10-16 09:42:46 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-10-16 09:42:46 -0400 |
commit | 4a0a88ed335e9082fe1acfbdf2593e179304b64e (patch) | |
tree | 6739972ed137d372bcf2dc000df56a4b7db02400 /indra/llcharacter/llvisualparam.h | |
parent | cc5f8686feee4efea124d582b99990dd987e1e98 (diff) | |
parent | 22f53c85588912582f33d840d106b10f54f2c62d (diff) |
merge
Diffstat (limited to 'indra/llcharacter/llvisualparam.h')
-rwxr-xr-x[-rw-r--r--] | indra/llcharacter/llvisualparam.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/llcharacter/llvisualparam.h b/indra/llcharacter/llvisualparam.h index 694e27f371..8345990f47 100644..100755 --- a/indra/llcharacter/llvisualparam.h +++ b/indra/llcharacter/llvisualparam.h @@ -50,6 +50,14 @@ enum EVisualParamGroup NUM_VISUAL_PARAM_GROUPS }; +enum EParamLocation +{ + LOC_UNKNOWN, + LOC_AV_SELF, + LOC_AV_OTHER, + LOC_WEARABLE +}; + const S32 MAX_TRANSMITTED_VISUAL_PARAMS = 255; //----------------------------------------------------------------------------- @@ -149,6 +157,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 @@ -160,6 +171,7 @@ protected: S32 mID; // id for storing weight/morphtarget compares compactly LLVisualParamInfo *mInfo; + EParamLocation mParamLocation; // where does this visual param live? }; #endif // LL_LLVisualParam_H |