diff options
| author | Richard Linden <none@none> | 2011-11-29 23:53:28 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-29 23:53:28 -0800 |
| commit | ff32ef773b19a6d0f7826c7edf7962e2fde492e6 (patch) | |
| tree | 6270fa5f92ce026864f6a423955b9a8a4463a8cf /indra/llrender | |
| parent | acd047b6be30bd1537aa62616ed70b02af7405b3 (diff) | |
fix for crash on startup (font system not initialized when first creating fonts)
Diffstat (limited to 'indra/llrender')
| -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, |