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.h | |
| parent | 9a7f79cbcf57c46e797d2e5626d534055f9a256d (diff) | |
| parent | dce043b3177eb9a7d017af2a7e9f889a18668e77 (diff) | |
Merge from remote repo
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(); |