diff options
author | Dave Parks <davep@lindenlab.com> | 2012-06-22 14:04:33 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-06-22 14:04:33 -0500 |
commit | 9e9d32de384b2807f195be48f49fbdec725f45d1 (patch) | |
tree | 802158bd1a8872500ffeee286256f4c3ff79ef72 /indra/newview/lltextureview.cpp | |
parent | 3c276c87bde4ff9403df93434e8dc5309a3441b9 (diff) | |
parent | defbd61d318d0da12fdea208cf2b2297d9a6b122 (diff) |
merge
Diffstat (limited to 'indra/newview/lltextureview.cpp')
-rw-r--r-- | indra/newview/lltextureview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp index 425bf7ee87..52d085dd2c 100644 --- a/indra/newview/lltextureview.cpp +++ b/indra/newview/lltextureview.cpp @@ -510,7 +510,7 @@ void LLGLTexMemBar::draw() F32 discard_bias = LLViewerTexture::sDesiredDiscardBias; F32 cache_usage = (F32)BYTES_TO_MEGA_BYTES(LLAppViewer::getTextureCache()->getUsage()) ; F32 cache_max_usage = (F32)BYTES_TO_MEGA_BYTES(LLAppViewer::getTextureCache()->getMaxUsage()) ; - S32 line_height = (S32)(LLFontGL::getFontMonospace()->getLineHeight() + .5f); + S32 line_height = LLFontGL::getFontMonospace()->getLineHeight(); S32 v_offset = 0;//(S32)((texture_bar_height + 2.2f) * mTextureView->mNumTextureBars + 2.0f); F32 total_texture_downloaded = (F32)gTotalTextureBytes / (1024 * 1024); F32 total_object_downloaded = (F32)gTotalObjectBytes / (1024 * 1024); |