summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturectrl.cpp
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-01-12 12:59:37 +0200
committerMike Antipov <mantipov@productengine.com>2010-01-12 12:59:37 +0200
commit94880f98fdcf3a2c7276e9f74f108ae35d9b3587 (patch)
tree665acec55ffa8aecb43da156c5045f5fc2bb3cf8 /indra/newview/lltexturectrl.cpp
parentbcb054970ce83fc613e1b6d163b3440457ca94d4 (diff)
parent3c3271761b918a19f7a10d80da9dd23e5127de2c (diff)
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
-rw-r--r--indra/newview/lltexturectrl.cpp6
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,