diff options
author | Oz Linden <oz@lindenlab.com> | 2013-10-23 13:05:59 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-10-23 13:05:59 -0400 |
commit | c9775dde6249582f0e8976be15e72bfebc4ac3fc (patch) | |
tree | 83407157dae234db649dfff763e68f6e3c843335 /indra/newview/llmaterialmgr.h | |
parent | 1a72325ef1e8c798066d8ef7f82acd08d60fb68c (diff) | |
parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) |
merge up to 3.6.9-release
Diffstat (limited to 'indra/newview/llmaterialmgr.h')
-rw-r--r-- | indra/newview/llmaterialmgr.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llmaterialmgr.h b/indra/newview/llmaterialmgr.h index e317a791ad..e83f1f4e01 100644 --- a/indra/newview/llmaterialmgr.h +++ b/indra/newview/llmaterialmgr.h @@ -124,6 +124,8 @@ protected: put_queue_t mPutQueue; material_map_t mMaterials; + + U32 getMaxEntries(const LLViewerRegion* regionp); }; #endif // LL_LLMATERIALMGR_H |