diff options
author | Leslie Linden <leslie@lindenlab.com> | 2011-07-28 12:15:32 -0700 |
---|---|---|
committer | Leslie Linden <leslie@lindenlab.com> | 2011-07-28 12:15:32 -0700 |
commit | 0b9327df241e1a5a4693c690810ce8c330e196ad (patch) | |
tree | 1bdff29f5e3de1764410a7bf706763d4a35ebe8b /indra/llui/llpanel.h | |
parent | 75452dd7a8f9f51bf3fbcb871976168f80e0cae0 (diff) | |
parent | b8d5c8993d46dc5b24bc07f721115a174ff918c8 (diff) |
Merge
Diffstat (limited to 'indra/llui/llpanel.h')
-rw-r--r-- | indra/llui/llpanel.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h index 1b777ee1cb..790025cb2d 100644 --- a/indra/llui/llpanel.h +++ b/indra/llui/llpanel.h @@ -265,6 +265,9 @@ protected: std::string mHelpTopic; // the name of this panel's help topic to display in the Help Viewer typedef std::deque<const LLCallbackMap::map_t*> factory_stack_t; static factory_stack_t sFactoryStack; + + // for setting the xml filename when building panel in context dependent cases + std::string mXMLFilename; private: BOOL mBgVisible; // any background at all? @@ -283,8 +286,6 @@ private: typedef std::map<std::string, std::string> ui_string_map_t; ui_string_map_t mUIStrings; - // for setting the xml filename when building panel in context dependent cases - std::string mXMLFilename; }; // end class LLPanel |