diff options
author | Kent Quirk <q@lindenlab.com> | 2010-03-23 23:02:02 -0400 |
---|---|---|
committer | Kent Quirk <q@lindenlab.com> | 2010-03-23 23:02:02 -0400 |
commit | 62ebb4533ceff1d0a7cf68a6385a8d3b34fa51d4 (patch) | |
tree | dd6cd1b313f933847c6e603d50a65ffbc82fee01 /indra/newview/llvoavatar.h | |
parent | 3ad56f22158dd2665204745af2171689f208cd7e (diff) | |
parent | ea8f1b80df0fcfcdbb52123b2ece68916ed139ff (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 |