diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-10-26 09:59:39 -0700 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-26 09:59:39 -0700 |
commit | d6e8f32b8073d85db59f2a45a10d622b71c859ae (patch) | |
tree | 953c5efd60338604c229824467270cd8d5a458ce /indra/llrender/llfontgl.cpp | |
parent | add9298c1e4d74bdb5503722a6c795ea6f30fa11 (diff) | |
parent | 53c972a521cbb92c6c9390c41b250a41dc22cd5a (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() { |