diff options
author | Josh Bell <josh@lindenlab.com> | 2008-04-24 18:38:17 +0000 |
---|---|---|
committer | Josh Bell <josh@lindenlab.com> | 2008-04-24 18:38:17 +0000 |
commit | 5c51ae5a7b48dfac8769e5dbdd10e79b18d90070 (patch) | |
tree | f63729c72f69dcb7d2bd5d9aa3a58c29e0c78128 /indra/llrender/llfontgl.h | |
parent | 39018947081772bf7226d757c647520c54b18fd2 (diff) |
svn merge -r 85582:85586 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer-5-merge
QAR-500 maint-viewer-5 merge
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 196d063840..e49a9fc296 100644 --- a/indra/llrender/llfontgl.h +++ b/indra/llrender/llfontgl.h @@ -228,6 +228,7 @@ public: static LLString sAppDir; // For loading fonts static LLFontGL* sMonospace; // medium + static LLFontList* sMonospaceFallback; static LLFontGL* sSansSerifSmall; // small static LLFontList* sSSSmallFallback; |