diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-10-23 12:15:22 -0700 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-23 12:15:22 -0700 |
commit | 127b428863707c882fbf4d30699321b8a2365644 (patch) | |
tree | 728c98bd177635891f0646ccabcf86b70341d4a0 /indra/llrender/llfontgl.cpp | |
parent | 0220106ecdecd323854522a5bc3fd6455c60fdfc (diff) | |
parent | 2438a9168b117dcabf5e5819f93e08a874735a26 (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() { |