diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-10-15 17:39:17 -0700 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-15 17:39:17 -0700 |
| commit | f1beac1a70e74bef5caf4850bd9146a583e00739 (patch) | |
| tree | 04dcca497b5b93d18d2b2cd093fa5fc3b2393925 /indra/llrender/llfontgl.cpp | |
| parent | 9a7f79cbcf57c46e797d2e5626d534055f9a256d (diff) | |
| parent | dce043b3177eb9a7d017af2a7e9f889a18668e77 (diff) | |
Merge from remote repo
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 f7bab3de67..16c99599cf 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -910,6 +910,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() { |