summaryrefslogtreecommitdiff
path: root/indra/newview/lltextureview.cpp
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2014-09-18 17:00:23 -0700
committerAura Linden <aura@lindenlab.com>2014-09-18 17:00:23 -0700
commit951c83724d7e364ac52cbee2d657711fda7d2c26 (patch)
tree20b95debd0a3bb52f32df0db52d6dc91caf5793f /indra/newview/lltextureview.cpp
parent78304e398fa7d4604eac98247173b33d712ec135 (diff)
parent61fb8c3fe31c73ce9121daac545aa7c8fc79ec8c (diff)
Merged in viewer-tiger
Diffstat (limited to 'indra/newview/lltextureview.cpp')
-rwxr-xr-xindra/newview/lltextureview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp
index 4f0413a2e4..b7786bcdd7 100755
--- a/indra/newview/lltextureview.cpp
+++ b/indra/newview/lltextureview.cpp
@@ -501,7 +501,7 @@ private:
void LLGLTexMemBar::draw()
{
S32Megabytes bound_mem = LLViewerTexture::sBoundTextureMemory;
- S32Megabytes max_bound_mem = LLViewerTexture::sMaxBoundTextureMem;
+ S32Megabytes max_bound_mem = LLViewerTexture::sMaxBoundTextureMemory;
S32Megabytes total_mem = LLViewerTexture::sTotalTextureMemory;
S32Megabytes max_total_mem = LLViewerTexture::sMaxTotalTextureMem;
F32 discard_bias = LLViewerTexture::sDesiredDiscardBias;