diff options
author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-26 14:50:36 -0800 |
---|---|---|
committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-26 14:50:36 -0800 |
commit | 14e82732f4f74ec59933bb9e6c67cf1ce7800a7f (patch) | |
tree | c2b5ff471400ced9342f7f3c1e4bc6b32d8df79f /indra/llrender/llfontregistry.h | |
parent | a897e69ffc36b8159e89031c38846395b6551d0b (diff) | |
parent | 890965faf5baa5f6f832e086991d59bb8d33b7bc (diff) |
merging in latest changes, resolved llimview.cpp conflict
Diffstat (limited to 'indra/llrender/llfontregistry.h')
-rw-r--r-- | indra/llrender/llfontregistry.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llrender/llfontregistry.h b/indra/llrender/llfontregistry.h index 8b06191c56..059248fbbd 100644 --- a/indra/llrender/llfontregistry.h +++ b/indra/llrender/llfontregistry.h @@ -67,8 +67,7 @@ class LLFontRegistry public: // create_gl_textures - set to false for test apps with no OpenGL window, // such as llui_libtest - LLFontRegistry(const string_vec_t& xui_paths, - bool create_gl_textures); + LLFontRegistry(bool create_gl_textures); ~LLFontRegistry(); // Load standard font info from XML file(s). @@ -105,7 +104,6 @@ private: font_size_map_t mFontSizes; string_vec_t mUltimateFallbackList; - string_vec_t mXUIPaths; bool mCreateGLTextures; }; |