diff options
author | Oz Linden <oz@lindenlab.com> | 2014-06-16 11:42:37 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-06-16 11:42:37 -0400 |
commit | e15002a11cf5081e0697065cb017ba0af6c4b32d (patch) | |
tree | d60ac6d3a85d114b7860e42be5d9ff3338a6a169 /indra/llappearance/llwearable.h | |
parent | 78be5c3aa5f7263698bec5bcbccb24c150f78d09 (diff) | |
parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) |
merge changes for 3.7.9-release
Diffstat (limited to 'indra/llappearance/llwearable.h')
-rwxr-xr-x[-rw-r--r--] | indra/llappearance/llwearable.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llappearance/llwearable.h b/indra/llappearance/llwearable.h index 132c153bcd..406fc7e883 100644..100755 --- a/indra/llappearance/llwearable.h +++ b/indra/llappearance/llwearable.h @@ -46,6 +46,7 @@ class LLWearable // Constructors and destructors //-------------------------------------------------------------------- public: + LLWearable(); virtual ~LLWearable(); //-------------------------------------------------------------------- @@ -94,14 +95,14 @@ public: void setLocalTextureObject(S32 index, LLLocalTextureObject <o); void addVisualParam(LLVisualParam *param); - void setVisualParamWeight(S32 index, F32 value, BOOL upload_bake); + void setVisualParamWeight(S32 index, F32 value); F32 getVisualParamWeight(S32 index) const; LLVisualParam* getVisualParam(S32 index) const; void getVisualParams(visual_param_vec_t &list); - void animateParams(F32 delta, BOOL upload_bake); + void animateParams(F32 delta); LLColor4 getClothesColor(S32 te) const; - void setClothesColor( S32 te, const LLColor4& new_color, BOOL upload_bake ); + void setClothesColor( S32 te, const LLColor4& new_color); virtual void revertValues(); virtual void saveValues(); |