diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-07-08 10:57:06 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-07-08 10:57:06 -0700 |
| commit | cbf72809061ce2e9f33e743bdee63ae75d4ff74e (patch) | |
| tree | 93e4b0f855e44bfddcf3ceb118cbe3adb98d248d /indra/newview/llmaterialmgr.h | |
| parent | 366932b81d55c562011239b68116ffb1a18ada97 (diff) | |
| parent | c2817b0d532af0c6af2b2b62084fd5c5cbab8140 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llmaterialmgr.h')
| -rw-r--r-- | indra/newview/llmaterialmgr.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llmaterialmgr.h b/indra/newview/llmaterialmgr.h index e83f1f4e01..e317a791ad 100644 --- a/indra/newview/llmaterialmgr.h +++ b/indra/newview/llmaterialmgr.h @@ -124,8 +124,6 @@ protected: put_queue_t mPutQueue; material_map_t mMaterials; - - U32 getMaxEntries(const LLViewerRegion* regionp); }; #endif // LL_LLMATERIALMGR_H |