diff options
author | Oz Linden <oz@lindenlab.com> | 2011-12-12 09:04:33 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-12-12 09:04:33 -0500 |
commit | f1a4593e471f4ae0e08767f73f100add683965bf (patch) | |
tree | 0f0f42a772c9c739ee5e726a8044e2888d17b735 /indra/newview/llvoavatar.h | |
parent | d7e6f21981b0a00c0d89096cc17bab07be60e51a (diff) | |
parent | 50a57ba9fec0435a990338398d5c4f23c5cc91f0 (diff) |
merge changes for vmrg-204
Diffstat (limited to 'indra/newview/llvoavatar.h')
-rw-r--r-- | indra/newview/llvoavatar.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index e53b8e3f4b..59796370ae 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -40,6 +40,7 @@ #include "lldrawpoolalpha.h" #include "llviewerobject.h" #include "llcharacter.h" +#include "llcontrol.h" #include "llviewerjointmesh.h" #include "llviewerjointattachment.h" #include "llrendertarget.h" @@ -450,6 +451,8 @@ private: F32 mImpostorDistance; F32 mImpostorPixelArea; LLVector3 mLastAnimExtents[2]; + + LLCachedControl<bool> mRenderUnloadedAvatar; //-------------------------------------------------------------------- // Wind rippling in clothes |