summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.h
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2010-07-20 16:37:10 -0600
committerXiaohong Bao <bao@lindenlab.com>2010-07-20 16:37:10 -0600
commit3dbe2837d9660c50c8db34f5131bd9258940b3c6 (patch)
treec4dbecac84faab894fbd0fda2d70727aa8d24017 /indra/newview/llvoavatar.h
parent271c06363cd8c077d110da6501392cf33a45017b (diff)
parenta49f4090b8d9d2519439b4d7ba4904b165d569cc (diff)
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
Diffstat (limited to 'indra/newview/llvoavatar.h')
-rw-r--r--indra/newview/llvoavatar.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 22fc595ea2..8ffcfc7ed4 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -1049,6 +1049,7 @@ protected: // Shared with LLVOAvatarSelf
*******************************************************************************/
}; // LLVOAvatar
-extern const F32 SELF_ADDITIONAL_PRI;
+extern const F32 SELF_ADDITIONAL_PRI;
+extern const S32 MAX_TEXTURE_VIRTURE_SIZE_RESET_INTERVAL;
#endif // LL_VO_AVATAR_H