diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-16 17:39:32 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-16 17:39:32 +0000 |
commit | 3bb628ff73c0cd06dc374c29db9f56d5f5ab283a (patch) | |
tree | aec7ced6a886bd19fbc2c39147ff5be95d864d5f /indra/newview/llvoavatar.h | |
parent | b6e11798acf6d0539211723e566be7f6145ac138 (diff) | |
parent | a5d1a7b1bac43a4aa88aa647b040a21ca951c682 (diff) |
merge from viewer-2-0
Diffstat (limited to 'indra/newview/llvoavatar.h')
-rw-r--r-- | indra/newview/llvoavatar.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index b5f0ec7176..d5485413f4 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -526,7 +526,9 @@ protected: public: virtual void invalidateComposite(LLTexLayerSet* layerset, BOOL upload_result); virtual void invalidateAll(); - virtual void setCompositeUpdatesEnabled(BOOL b); + virtual void setCompositeUpdatesEnabled(bool b) {} + virtual void setCompositeUpdatesEnabled(U32 index, bool b) {} + virtual bool isCompositeUpdateEnabled(U32 index) { return false; } //-------------------------------------------------------------------- // Static texture/mesh/baked dictionary |