diff options
| author | McCabe Maxsted | 2009-11-09 15:42:46 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-11-09 15:42:46 -0700 |
| commit | bd5150eebfd13e0ac525ece84af2c6a770558337 (patch) | |
| tree | b976153817d64477f6f613df7eceabaf926fa8f5 /linden | |
| parent | Media browser now compiles (TODO: rewrite this file again) (diff) | |
| download | meta-impy-bd5150eebfd13e0ac525ece84af2c6a770558337.zip meta-impy-bd5150eebfd13e0ac525ece84af2c6a770558337.tar.gz meta-impy-bd5150eebfd13e0ac525ece84af2c6a770558337.tar.bz2 meta-impy-bd5150eebfd13e0ac525ece84af2c6a770558337.tar.xz | |
Updated asset browser from old font system
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llfloaterassetbrowser.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llfloaterassetbrowser.cpp b/linden/indra/newview/llfloaterassetbrowser.cpp index 615d21a..cb2412d 100644 --- a/linden/indra/newview/llfloaterassetbrowser.cpp +++ b/linden/indra/newview/llfloaterassetbrowser.cpp | |||
| @@ -87,7 +87,7 @@ void LLFloaterAssetBrowser::initialize() | |||
| 87 | S32 image_top = getRect().getHeight(); | 87 | S32 image_top = getRect().getHeight(); |
| 88 | S32 image_bottom = BTN_HEIGHT_SMALL; | 88 | S32 image_bottom = BTN_HEIGHT_SMALL; |
| 89 | S32 image_middle = (image_top + image_bottom) / 2; | 89 | S32 image_middle = (image_top + image_bottom) / 2; |
| 90 | S32 line_height = llround(LLFontGL::sSansSerifSmall->getLineHeight()); | 90 | S32 line_height = llround(LLFontGL::getFontSansSerifSmall()->getLineHeight()); |
| 91 | 91 | ||
| 92 | mNoAssetsLabel = new LLTextBox("mNoAssetsLabel.", | 92 | mNoAssetsLabel = new LLTextBox("mNoAssetsLabel.", |
| 93 | LLRect(getRect().getWidth()/2, | 93 | LLRect(getRect().getWidth()/2, |
| @@ -95,7 +95,7 @@ void LLFloaterAssetBrowser::initialize() | |||
| 95 | getRect().getWidth(), | 95 | getRect().getWidth(), |
| 96 | image_middle - line_height / 2 ), | 96 | image_middle - line_height / 2 ), |
| 97 | "No assets found.", | 97 | "No assets found.", |
| 98 | LLFontGL::sSansSerifSmall ); | 98 | LLFontGL::getFontSansSerifSmall() ); |
| 99 | mNoAssetsLabel->setFollowsAll(); | 99 | mNoAssetsLabel->setFollowsAll(); |
| 100 | addChild(mNoAssetsLabel); | 100 | addChild(mNoAssetsLabel); |
| 101 | mNoAssetsLabel->setVisible(FALSE); | 101 | mNoAssetsLabel->setVisible(FALSE); |
| @@ -314,7 +314,7 @@ void LLFloaterAssetBrowser::draw() | |||
| 314 | info_rect.mLeft = border.mLeft; | 314 | info_rect.mLeft = border.mLeft; |
| 315 | info_rect.mTop = border.mBottom - 3; | 315 | info_rect.mTop = border.mBottom - 3; |
| 316 | info_rect.mRight = border.mLeft + 130; | 316 | info_rect.mRight = border.mLeft + 130; |
| 317 | info_rect.mBottom = border.mBottom - 2*llround(LLFontGL::sSansSerifSmall->getLineHeight()); | 317 | info_rect.mBottom = border.mBottom - 2*llround(LLFontGL::getFontSansSerifSmall()->getLineHeight()); |
| 318 | 318 | ||
| 319 | gl_rect_2d(border, LLColor4::black, FALSE); | 319 | gl_rect_2d(border, LLColor4::black, FALSE); |
| 320 | 320 | ||
| @@ -350,7 +350,7 @@ void LLFloaterAssetBrowser::draw() | |||
| 350 | mAssetInfoLabel = new LLTextBox("Asset Info"/*mTextureAssets[i].mAssetInfo*/, | 350 | mAssetInfoLabel = new LLTextBox("Asset Info"/*mTextureAssets[i].mAssetInfo*/, |
| 351 | info_rect, | 351 | info_rect, |
| 352 | asset_info, | 352 | asset_info, |
| 353 | LLFontGL::sSansSerifSmall); | 353 | LLFontGL::getFontSansSerifSmall()); |
| 354 | mAssetInfoLabel->setFollowsAll(); | 354 | mAssetInfoLabel->setFollowsAll(); |
| 355 | mAssetInfoLabelList.push_back(mAssetInfoLabel); | 355 | mAssetInfoLabelList.push_back(mAssetInfoLabel); |
| 356 | addChild(mAssetInfoLabelList[mAssetInfoIndex]); | 356 | addChild(mAssetInfoLabelList[mAssetInfoIndex]); |