diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-01-11 12:12:58 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-11 12:12:58 -0800 |
| commit | d2f6350993d8b6cb17424e4dfb71ea61444b178f (patch) | |
| tree | c9673256a20e9f84fb2cec0a49af43851f0be660 /indra/newview/lltexturectrl.cpp | |
| parent | daa4965fe053dbd1af1f9665b29a4a10ac31cfea (diff) | |
| parent | 29695bd08a86dd801e4dbae5e16967cda40fd53f (diff) | |
Automated merge with http://demeter:8000
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 25e5e23e6f..a5ddb0a620 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -1242,11 +1242,11 @@ void LLTextureCtrl::draw() (mTexturep->getDiscardLevel() != 1) && (mTexturep->getDiscardLevel() != 0)) { - LLFontGL* font = LLFontGL::getFontSansSerifBig(); + LLFontGL* font = LLFontGL::getFontSansSerif(); font->renderUTF8( mLoadingPlaceholderString, 0, - llfloor(interior.mLeft+10), - llfloor(interior.mTop-20), + llfloor(interior.mLeft+3), + llfloor(interior.mTop-25), LLColor4::white, LLFontGL::LEFT, LLFontGL::BASELINE, |