diff options
author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-19 12:01:51 -0800 |
---|---|---|
committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-19 12:01:51 -0800 |
commit | 62301cb883dd6fadcd5d30acd604f72d2c0b1794 (patch) | |
tree | baa94e42e64a07351c8e9722c578e94b43a811d8 /indra/llrender/llfontregistry.h | |
parent | 6036ee9c421154a83a306bc16533e47f9494fd32 (diff) | |
parent | 185169cbbecebe2a35dbd937d6fb4e0a30fa1832 (diff) |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
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; }; |