diff options
| author | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
| commit | fdf944fb0355249d73c4e25ee86e9ffd378e7d4b (patch) | |
| tree | 2e5c51fe0e6d5757f984721e01cc097801d927e7 /linden/indra/llui/llpanel.h | |
| parent | Rebranded Windows-specific installer/support files. (diff) | |
| parent | Updated source to SL version 1.21.6. (diff) | |
| download | meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.zip meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.gz meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.bz2 meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.xz | |
Merge branch 'merge-1.21.6' into rebranding
Conflicts:
linden/indra/newview/installers/windows/installer_template.nsi
linden/indra/newview/llappviewer.cpp
Diffstat (limited to 'linden/indra/llui/llpanel.h')
| -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; |