aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llrender
diff options
context:
space:
mode:
authorMcCabe Maxsted2011-03-24 02:18:34 -0700
committerMcCabe Maxsted2011-03-24 02:24:04 -0700
commit0de9bb9ceca63a66e396c009ed4e291d5c862de7 (patch)
tree2c0a40259b5d9bf00b24f3f226ca2c9ac2267c8d /linden/indra/llrender
parentComboboxes can now use the font= xui setting (diff)
downloadmeta-impy-0de9bb9ceca63a66e396c009ed4e291d5c862de7.zip
meta-impy-0de9bb9ceca63a66e396c009ed4e291d5c862de7.tar.gz
meta-impy-0de9bb9ceca63a66e396c009ed4e291d5c862de7.tar.bz2
meta-impy-0de9bb9ceca63a66e396c009ed4e291d5c862de7.tar.xz
Added a new default font size FontSansSerifBigger and fixed FontSansSerifBig not being named FontSansSerifLarge
Diffstat (limited to 'linden/indra/llrender')
-rw-r--r--linden/indra/llrender/llfontgl.cpp11
-rw-r--r--linden/indra/llrender/llfontgl.h3
2 files changed, 11 insertions, 3 deletions
diff --git a/linden/indra/llrender/llfontgl.cpp b/linden/indra/llrender/llfontgl.cpp
index 7baec81..306c6b9 100644
--- a/linden/indra/llrender/llfontgl.cpp
+++ b/linden/indra/llrender/llfontgl.cpp
@@ -242,7 +242,8 @@ BOOL LLFontGL::initDefaultFonts(F32 screen_dpi, F32 x_scale, F32 y_scale,
242 // This is primarily for error detection purposes. 242 // This is primarily for error detection purposes.
243 succ &= (NULL != getFontSansSerifSmall()); 243 succ &= (NULL != getFontSansSerifSmall());
244 succ &= (NULL != getFontSansSerif()); 244 succ &= (NULL != getFontSansSerif());
245 succ &= (NULL != getFontSansSerifBig()); 245 succ &= (NULL != getFontSansSerifBigger());
246 succ &= (NULL != getFontSansSerifLarge());
246 succ &= (NULL != getFontSansSerifHuge()); 247 succ &= (NULL != getFontSansSerifHuge());
247 succ &= (NULL != getFontSansSerifBold()); 248 succ &= (NULL != getFontSansSerifBold());
248 succ &= (NULL != getFontMonospace()); 249 succ &= (NULL != getFontMonospace());
@@ -313,7 +314,13 @@ LLFontGL* LLFontGL::getFontSansSerif()
313} 314}
314 315
315//static 316//static
316LLFontGL* LLFontGL::getFontSansSerifBig() 317LLFontGL* LLFontGL::getFontSansSerifBigger()
318{
319 return getFont(LLFontDescriptor("SansSerif","Bigger",0));
320}
321
322//static
323LLFontGL* LLFontGL::getFontSansSerifLarge()
317{ 324{
318 return getFont(LLFontDescriptor("SansSerif","Large",0)); 325 return getFont(LLFontDescriptor("SansSerif","Large",0));
319} 326}
diff --git a/linden/indra/llrender/llfontgl.h b/linden/indra/llrender/llfontgl.h
index 6cb1727..e3a953b 100644
--- a/linden/indra/llrender/llfontgl.h
+++ b/linden/indra/llrender/llfontgl.h
@@ -233,7 +233,8 @@ public:
233 static LLFontGL* getFontMonospace(); 233 static LLFontGL* getFontMonospace();
234 static LLFontGL* getFontSansSerifSmall(); 234 static LLFontGL* getFontSansSerifSmall();
235 static LLFontGL* getFontSansSerif(); 235 static LLFontGL* getFontSansSerif();
236 static LLFontGL* getFontSansSerifBig(); 236 static LLFontGL* getFontSansSerifBigger();
237 static LLFontGL* getFontSansSerifLarge();
237 static LLFontGL* getFontSansSerifHuge(); 238 static LLFontGL* getFontSansSerifHuge();
238 static LLFontGL* getFontSansSerifBold(); 239 static LLFontGL* getFontSansSerifBold();
239 static LLFontGL* getFontExtChar(); 240 static LLFontGL* getFontExtChar();