diff options
author | Merov Linden <merov@lindenlab.com> | 2012-05-02 15:59:15 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-05-02 15:59:15 -0700 |
commit | 56af97063aaa35c1a70f5edaf47f4a015600860d (patch) | |
tree | 299b113fab1ff7176c86342aa3e881491cd3b883 /indra/newview/lltextureview.cpp | |
parent | b679975d8fdc22d33d0f62288934be8f0209157e (diff) | |
parent | 681c5de92bd09622de360818682240b0a17403f7 (diff) |
Pull from vir/drano
Diffstat (limited to 'indra/newview/lltextureview.cpp')
-rwxr-xr-x | indra/newview/lltextureview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp index 68dd8cb23b..425bf7ee87 100755 --- a/indra/newview/lltextureview.cpp +++ b/indra/newview/lltextureview.cpp @@ -384,7 +384,7 @@ public: Params() : texture_view("texture_view") { - S32 line_height = (S32)(LLFontGL::getFontMonospace()->getLineHeight() + .5f); + S32 line_height = LLFontGL::getFontMonospace()->getLineHeight(); changeDefault(rect, LLRect(0,0,100,line_height * 4)); } }; @@ -409,7 +409,7 @@ void LLAvatarTexBar::draw() LLVOAvatarSelf* avatarp = gAgentAvatarp; if (!avatarp) return; - const S32 line_height = (S32)(LLFontGL::getFontMonospace()->getLineHeight() + .5f); + const S32 line_height = LLFontGL::getFontMonospace()->getLineHeight(); const S32 v_offset = 0; const S32 l_offset = 3; @@ -483,7 +483,7 @@ public: Params() : texture_view("texture_view") { - S32 line_height = (S32)(LLFontGL::getFontMonospace()->getLineHeight() + .5f); + S32 line_height = LLFontGL::getFontMonospace()->getLineHeight(); changeDefault(rect, LLRect(0,0,100,line_height * 4)); } }; |