From b82bda605d85fe9b1ad69ce36a36de18a2924924 Mon Sep 17 00:00:00 2001
From: richard <none@none>
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<const LLFontGL*> be SansSerif

reviewed by Leyla
---
 indra/llui/llui.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'indra/llui/llui.h')

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*>
-- 
cgit v1.2.3