diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llui/llpanel.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/llui/llpanel.h b/linden/indra/llui/llpanel.h index 46cde5b..8ed739e 100644 --- a/linden/indra/llui/llpanel.h +++ b/linden/indra/llui/llpanel.h | |||
@@ -151,8 +151,8 @@ public: | |||
151 | void initChildrenXML(LLXMLNodePtr node, LLUICtrlFactory* factory); | 151 | void initChildrenXML(LLXMLNodePtr node, LLUICtrlFactory* factory); |
152 | void setPanelParameters(LLXMLNodePtr node, LLView *parentp); | 152 | void setPanelParameters(LLXMLNodePtr node, LLView *parentp); |
153 | 153 | ||
154 | std::string getString(const std::string& name, const LLStringUtil::format_map_t& args = LLUIString::sNullArgs) const; | 154 | std::string getString(const std::string& name, const LLStringUtil::format_map_t& args) const; |
155 | LLUIString getUIString(const std::string& name) const; | 155 | std::string getString(const std::string& name) const; |
156 | 156 | ||
157 | // ** Wrappers for setting child properties by name ** -TomY | 157 | // ** Wrappers for setting child properties by name ** -TomY |
158 | 158 | ||
@@ -261,7 +261,7 @@ private: | |||
261 | S32 mLastTabGroup; | 261 | S32 mLastTabGroup; |
262 | LLRootHandle<LLPanel> mPanelHandle; | 262 | LLRootHandle<LLPanel> mPanelHandle; |
263 | 263 | ||
264 | typedef std::map<std::string, LLUIString> ui_string_map_t; | 264 | typedef std::map<std::string, std::string> ui_string_map_t; |
265 | ui_string_map_t mUIStrings; | 265 | ui_string_map_t mUIStrings; |
266 | 266 | ||
267 | std::string mRequirementsError; | 267 | std::string mRequirementsError; |