diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-15 14:21:03 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-15 14:21:03 -0700 |
| commit | dce043b3177eb9a7d017af2a7e9f889a18668e77 (patch) | |
| tree | 1029565038ae3e23ee4e96e8432cb28ff80ba83c /indra/llrender/llfontgl.cpp | |
| parent | e9f7205ba9f4dfb3422759218609b62d61972722 (diff) | |
| parent | 590d3b9e3a2abdd37270ca64689a64c4e879fbe6 (diff) | |
Merge from branch-test (EXT-1279)
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() { |