summaryrefslogtreecommitdiff
path: root/indra/llui/llui.h
diff options
context:
space:
mode:
authorrichard <none@none>2009-10-30 17:46:01 -0700
committerrichard <none@none>2009-10-30 17:46:01 -0700
commitb82bda605d85fe9b1ad69ce36a36de18a2924924 (patch)
tree813faac1cc247553f5cb32325840fb0b7e87e3da /indra/llui/llui.h
parentfd1e10a4ca7e32a7f1cfe29637dd994c69625e84 (diff)
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<const LLFontGL*> be SansSerif reviewed by Leyla
Diffstat (limited to 'indra/llui/llui.h')
-rw-r--r--indra/llui/llui.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/llui/llui.h b/indra/llui/llui.h
index efb1b0a36f..5ec07f1941 100644
--- a/indra/llui/llui.h
+++ b/indra/llui/llui.h
@@ -404,6 +404,20 @@ namespace LLInitParam
LLUIColor getValueFromBlock() const;
};
+ // provide a better default for Optional<const LLFontGL*> than NULL
+ template <>
+ struct DefaultInitializer<const LLFontGL*>
+ {
+ // return reference to a single default instance of T
+ // built-in types will be initialized to zero, default constructor otherwise
+ static const LLFontGL* get()
+ {
+ static const LLFontGL* sDefaultFont = LLFontGL::getFontDefault();
+ return sDefaultFont;
+ }
+ };
+
+
template<>
class TypedParam<const LLFontGL*>
: public BlockValue<const LLFontGL*>