From 31e7c77a411d94bc87f0232588b339149bb29a49 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sun, 28 Sep 2008 17:21:23 -0500 Subject: Second Life viewer sources 1.21.3-RC --- linden/indra/llui/llpanel.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'linden/indra/llui/llpanel.h') 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: void initChildrenXML(LLXMLNodePtr node, LLUICtrlFactory* factory); void setPanelParameters(LLXMLNodePtr node, LLView *parentp); - std::string getString(const std::string& name, const LLStringUtil::format_map_t& args = LLUIString::sNullArgs) const; - LLUIString getUIString(const std::string& name) const; + std::string getString(const std::string& name, const LLStringUtil::format_map_t& args) const; + std::string getString(const std::string& name) const; // ** Wrappers for setting child properties by name ** -TomY @@ -261,7 +261,7 @@ private: S32 mLastTabGroup; LLRootHandle mPanelHandle; - typedef std::map ui_string_map_t; + typedef std::map ui_string_map_t; ui_string_map_t mUIStrings; std::string mRequirementsError; -- cgit v1.1