diff options
| author | Richard Linden <none@none> | 2011-11-29 23:54:00 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-29 23:54:00 -0800 |
| commit | 0323a37ac6c55e3ed599f60f4950c49e0e084c4a (patch) | |
| tree | 5375e3679b21e8e7893bb5b8761ba681f981c68e /indra/llrender | |
| parent | f2f90b6ed8e493a42aff805135527d6a7a345e3e (diff) | |
| parent | ff32ef773b19a6d0f7826c7edf7962e2fde492e6 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
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, |