diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-10-19 12:57:25 -0700 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-19 12:57:25 -0700 |
commit | 9fc74de1a18bbb209ee2524b0c833b3016ffc5e3 (patch) | |
tree | 134b4ef690e12793dbfe60167625b65dcec6e996 /indra/llrender/llfontgl.cpp | |
parent | 0d6f1d125eb0f6de766d617978a022fc74b4aec7 (diff) | |
parent | 909e784deb73d1da73928448cddb219af42ada93 (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() { |