diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-10-23 12:17:30 -0700 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-23 12:17:30 -0700 |
commit | 80b682d4b4dd1256ee09dd3327d2c51e3adee0b5 (patch) | |
tree | 751731e4b23e08264caf6436ae2c60cff8094240 /indra/llrender/llfontgl.cpp | |
parent | b43771cad585cb9820941eb1b24b67390eaa9435 (diff) | |
parent | 127b428863707c882fbf4d30699321b8a2365644 (diff) |
merge
Diffstat (limited to 'indra/llrender/llfontgl.cpp')
-rw-r--r-- | indra/llrender/llfontgl.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index c9163d2890..793a526c26 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -893,6 +893,13 @@ LLFontGL* LLFontGL::getFontByName(const std::string& name) } } +//static +LLFontGL* LLFontGL::getFontDefault() +{ + return getFontSansSerif(); // Fallback to sans serif as default font +} + + // static std::string LLFontGL::getFontPathSystem() { |