diff options
author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-16 18:13:53 -0700 |
---|---|---|
committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-16 18:13:53 -0700 |
commit | b4275c5d48c8cdf4bbe206822878fcf615897ac9 (patch) | |
tree | 4ef9b931f0a9c8f2b3073c5c33e06672fa56d345 /indra/llrender/llfontgl.cpp | |
parent | 3e10fa4d51a23bf6f1ced23e8d90c636d84fa5db (diff) | |
parent | cb1b361b49c9ae6a76eaeeb4476a341a024a71f1 (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() { |