From 590d3b9e3a2abdd37270ca64689a64c4e879fbe6 Mon Sep 17 00:00:00 2001 From: Steve Bennetts Date: Thu, 15 Oct 2009 14:14:46 -0700 Subject: EXT-1279 Crash if font file not found. Added getFontDefault() to llfontgl.h --HG-- branch : branch-test --- indra/llui/llui.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'indra/llui/llui.cpp') diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index c89e5944fa..eb1b60244d 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -1954,7 +1954,12 @@ namespace LLInitParam return fontp; } } - + + if (mData.mValue == NULL) + { + mData.mValue = LLFontGL::getFontDefault(); + } + // default to current value return mData.mValue; } -- cgit v1.2.3 From 53c972a521cbb92c6c9390c41b250a41dc22cd5a Mon Sep 17 00:00:00 2001 From: Steve Bennetts Date: Sun, 25 Oct 2009 23:05:15 -0700 Subject: * Changes to enable differentiating between icon texture priority and other UI texture priority. * Still need to only request smaller mip maps of icon textures --- indra/llui/llui.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/llui/llui.cpp') diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index da9384f876..48504a1e54 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -1807,11 +1807,11 @@ void LLUI::glRectToScreen(const LLRect& gl, LLRect *screen) } //static -LLPointer LLUI::getUIImageByID(const LLUUID& image_id) +LLPointer LLUI::getUIImageByID(const LLUUID& image_id, S32 priority) { if (sImageProvider) { - return sImageProvider->getUIImageByID(image_id); + return sImageProvider->getUIImageByID(image_id, priority); } else { @@ -1820,10 +1820,10 @@ LLPointer LLUI::getUIImageByID(const LLUUID& image_id) } //static -LLPointer LLUI::getUIImage(const std::string& name) +LLPointer LLUI::getUIImage(const std::string& name, S32 priority) { if (!name.empty() && sImageProvider) - return sImageProvider->getUIImage(name); + return sImageProvider->getUIImage(name, priority); else return NULL; } -- cgit v1.2.3 From b82bda605d85fe9b1ad69ce36a36de18a2924924 Mon Sep 17 00:00:00 2001 From: richard Date: Fri, 30 Oct 2009 17:46:01 -0700 Subject: EXT-2018 PRofile "Real World" descripton scrolls before showing "More" link EXT-2011 titles of IM sessions aren't aligned to center EXT-3025 Pick's description overlaps picks name also moved tool tip param default to tool_tip.xml also made default param be SansSerif reviewed by Leyla --- indra/llui/llui.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'indra/llui/llui.cpp') diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index 48504a1e54..a82e6eb372 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -1953,11 +1953,6 @@ namespace LLInitParam } } - if (mData.mValue == NULL) - { - mData.mValue = LLFontGL::getFontDefault(); - } - // default to current value return mData.mValue; } -- cgit v1.2.3