diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-11 12:07:49 -0500 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-11 12:07:49 -0500 |
commit | ea3b99614327404f15f8c0cf98ae6d61bdd4572b (patch) | |
tree | d355c3058604832bc9b1b08f999a3c371d7e1d1f /indra/newview/llvovolume.h | |
parent | 6d9fe27a251665ff73659dd1d60b78a2658601fb (diff) | |
parent | 3089e1a17a1f5bac1487fa56796f2b52244886e9 (diff) |
Automated merge with ssh://nyx@hg.lindenlab.com/tulla/avatar-pipeline-2-0/
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llvovolume.h')
-rw-r--r-- | indra/newview/llvovolume.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index 06e214b41e..fe4b5488fa 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -310,6 +310,8 @@ public: static LLPointer<LLObjectMediaDataClient> sObjectMediaClient; static LLPointer<LLObjectMediaNavigateClient> sObjectMediaNavigateClient; + static const U32 ARC_TEXTURE_COST = 5; + protected: static S32 sNumLODChanges; |