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.h | |
| parent | e9f7205ba9f4dfb3422759218609b62d61972722 (diff) | |
| parent | 590d3b9e3a2abdd37270ca64689a64c4e879fbe6 (diff) | |
Merge from branch-test (EXT-1279)
Diffstat (limited to 'indra/llrender/llfontgl.h')
| -rw-r--r-- | indra/llrender/llfontgl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h index ad84b6d641..d6d6436aee 100644 --- a/indra/llrender/llfontgl.h +++ b/indra/llrender/llfontgl.h @@ -167,6 +167,7 @@ public: static LLFontGL* getFont(const LLFontDescriptor& desc); // Use with legacy names like "SANSSERIF_SMALL" or "OCRA" static LLFontGL* getFontByName(const std::string& name); + static LLFontGL* getFontDefault(); // default fallback font static std::string getFontPathLocal(); static std::string getFontPathSystem(); |