diff options
| author | David Seikel | 2011-04-03 23:03:16 +1000 |
|---|---|---|
| committer | David Seikel | 2011-04-03 23:03:16 +1000 |
| commit | be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2 (patch) | |
| tree | 342cc5a544940b370a129dcdf93cadb2ef46f06c /linden/indra/newview/lltexturectrl.cpp | |
| parent | Push some of the trivial changes from the accountList branch. (diff) | |
| parent | Changed version to Experimental 2011.04.02. (diff) | |
| download | meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.zip meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.tar.gz meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.tar.bz2 meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.tar.xz | |
Merge remote-tracking branch 'jacek/exp' into exp
Conflicts:
.gitignore
linden/indra/newview/English.lproj/InfoPlist.strings
linden/indra/newview/llpanellogin.cpp
linden/indra/newview/res/viewerRes.rc
linden/indra/newview/skins/default/xui/en-us/panel_login.xml
linden/install.xml
Mostly went with my originals, manually merged llpaterrogin.cpp and panel_login.xml.
Diffstat (limited to 'linden/indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | linden/indra/newview/lltexturectrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp index 38849f9..ccc3ab2 100644 --- a/linden/indra/newview/lltexturectrl.cpp +++ b/linden/indra/newview/lltexturectrl.cpp | |||
| @@ -1514,7 +1514,7 @@ void LLTextureCtrl::draw() | |||
| 1514 | (mTexturep->getDiscardLevel() != 1) && | 1514 | (mTexturep->getDiscardLevel() != 1) && |
| 1515 | (mTexturep->getDiscardLevel() != 0)) | 1515 | (mTexturep->getDiscardLevel() != 0)) |
| 1516 | { | 1516 | { |
| 1517 | LLFontGL* font = LLFontGL::getFontSansSerifBig(); | 1517 | LLFontGL* font = LLFontGL::getFontSansSerifLarge(); |
| 1518 | font->renderUTF8( | 1518 | font->renderUTF8( |
| 1519 | mLoadingPlaceholderString, 0, | 1519 | mLoadingPlaceholderString, 0, |
| 1520 | llfloor(interior.mLeft+10), | 1520 | llfloor(interior.mLeft+10), |