aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/newview/llfloaterassetbrowser.cpp8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 8018ec2..fec18b6 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -4,6 +4,11 @@
4 4
52009-11-09 McCabe Maxsted <hakushakukun@gmail.com> 52009-11-09 McCabe Maxsted <hakushakukun@gmail.com>
6 6
7 * Updated asset browser from old font system.
8
9 modified: linden/indra/newview/llfloaterassetbrowser.cpp
10
11
7 * Media browser now compiles (TODO: rewrite this file again). 12 * Media browser now compiles (TODO: rewrite this file again).
8 13
9 modified: linden/indra/newview/llfloaterhtmlhelp.cpp 14 modified: linden/indra/newview/llfloaterhtmlhelp.cpp
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]);