diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-10-21 09:16:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-10-21 09:16:56 -0400 |
| commit | 4c8e526b99cb717e9086dec87a94b56fecad8984 (patch) | |
| tree | 45294c593721be9bc8def1563b07438554dfa08b /indra/newview/lllocalbitmaps.cpp | |
| parent | d3387faca57c560279a6b8b83711a789b84f0ecd (diff) | |
| parent | a0a61ff61e6cf38ccbd0d0a9eecb10d532feaf55 (diff) | |
merge changes for callum fixes and workarounds
Diffstat (limited to 'indra/newview/lllocalbitmaps.cpp')
| -rwxr-xr-x | indra/newview/lllocalbitmaps.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp index 897ee8429a..2c2e66e08f 100755 --- a/indra/newview/lllocalbitmaps.cpp +++ b/indra/newview/lllocalbitmaps.cpp @@ -74,7 +74,6 @@ bool LLLocalBitmapMgr::sNeedsRebake; static const F32 LL_LOCAL_TIMER_HEARTBEAT = 3.0; static const BOOL LL_LOCAL_USE_MIPMAPS = true; static const S32 LL_LOCAL_DISCARD_LEVEL = 0; -static const U32 LL_LOCAL_TEXLAYER_FOR_IDX = 0; static const bool LL_LOCAL_SLAM_FOR_DEBUG = true; static const bool LL_LOCAL_REPLACE_ON_DEL = true; static const S32 LL_LOCAL_UPDATE_RETRIES = 5; |