diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-09-29 19:14:50 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-09-29 19:14:50 +0000 |
| commit | d725e5b24075b2171f8a5b263969991e9b475078 (patch) | |
| tree | f1422064fd0ab676dfa66d39b5d0f0b9e8ff1086 /indra/llui/llpanel.h | |
| parent | 66739da16407a8e56accc236bd3996c1963a6bcf (diff) | |
QAR-872 Viewer 1.21 RC 3
merge viewer_1-21 96116-97380 -> release
Diffstat (limited to 'indra/llui/llpanel.h')
| -rw-r--r-- | indra/llui/llpanel.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h index 1fe6a5679e..355e32f1cd 100644 --- a/indra/llui/llpanel.h +++ b/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<LLPanel> mPanelHandle; - typedef std::map<std::string, LLUIString> ui_string_map_t; + typedef std::map<std::string, std::string> ui_string_map_t; ui_string_map_t mUIStrings; std::string mRequirementsError; |