diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-06-07 05:47:50 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-06-07 05:47:50 -0400 |
| commit | ce563795e1f5d7493b975393bea9ec5cab90fd6a (patch) | |
| tree | edc0b403ee80989bfa55b6d1cae3680093fb61fc /indra/llrender/llfontfreetype.cpp | |
| parent | d167ebe35f8cdec1ca88e0d817e2878f14a5aa68 (diff) | |
| parent | 89ea7ccfc7fd4c33eab4ad9123141fa40231a00d (diff) | |
MAINT-1144: Merge llhttpclient_test.cpp fix back to tip
Diffstat (limited to 'indra/llrender/llfontfreetype.cpp')
| -rw-r--r-- | indra/llrender/llfontfreetype.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp index 91c8a37022..66d4ad2d87 100644 --- a/indra/llrender/llfontfreetype.cpp +++ b/indra/llrender/llfontfreetype.cpp @@ -55,7 +55,10 @@ FT_Library gFTLibrary = NULL; //static void LLFontManager::initClass() { - gFontManagerp = new LLFontManager; + if (!gFontManagerp) + { + gFontManagerp = new LLFontManager; + } } //static @@ -136,7 +139,7 @@ BOOL LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 v FT_Done_Face(mFTFace); mFTFace = NULL; } - + int error; error = FT_New_Face( gFTLibrary, |