diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llui/lluistring.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/linden/indra/llui/lluistring.h b/linden/indra/llui/lluistring.h index 5983e1d..aedeca2 100644 --- a/linden/indra/llui/lluistring.h +++ b/linden/indra/llui/lluistring.h | |||
@@ -18,7 +18,8 @@ | |||
18 | * There are special exceptions to the terms and conditions of the GPL as | 18 | * There are special exceptions to the terms and conditions of the GPL as |
19 | * it is applied to this Source Code. View the full text of the exception | 19 | * it is applied to this Source Code. View the full text of the exception |
20 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 20 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
21 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 21 | * online at |
22 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
22 | * | 23 | * |
23 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
24 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
@@ -50,9 +51,9 @@ | |||
50 | // llinfos << mMessage.getString() << llendl; // outputs "Welcome Steve to Second Life" | 51 | // llinfos << mMessage.getString() << llendl; // outputs "Welcome Steve to Second Life" |
51 | // mMessage.setArg("[USERNAME]", "Joe"); | 52 | // mMessage.setArg("[USERNAME]", "Joe"); |
52 | // llinfos << mMessage.getString() << llendl; // outputs "Welcome Joe to Second Life" | 53 | // llinfos << mMessage.getString() << llendl; // outputs "Welcome Joe to Second Life" |
53 | // mMessage = "Recepción a la [SECONDLIFE] [USERNAME]" | 54 | // mMessage = "Recepci￳n a la [SECONDLIFE] [USERNAME]" |
54 | // mMessage.setArg("[SECONDLIFE]", "Segunda Vida"); | 55 | // mMessage.setArg("[SECONDLIFE]", "Segunda Vida"); |
55 | // llinfos << mMessage.getString() << llendl; // outputs "Recepción a la Segunda Vida Joe" | 56 | // llinfos << mMessage.getString() << llendl; // outputs "Recepci￳n a la Segunda Vida Joe" |
56 | 57 | ||
57 | // Implementation Notes: | 58 | // Implementation Notes: |
58 | // Attempting to have operator[](const std::string& s) return mArgs[s] fails because we have | 59 | // Attempting to have operator[](const std::string& s) return mArgs[s] fails because we have |
@@ -71,6 +72,8 @@ public: | |||
71 | LLUIString& operator=(const std::string& s) { assign(s); return *this; } | 72 | LLUIString& operator=(const std::string& s) { assign(s); return *this; } |
72 | 73 | ||
73 | void setArgList(const LLStringUtil::format_map_t& args); | 74 | void setArgList(const LLStringUtil::format_map_t& args); |
75 | void setArgs(const LLStringUtil::format_map_t& args) { setArgList(args); } | ||
76 | void setArgs(const class LLSD& sd); | ||
74 | void setArg(const std::string& key, const std::string& replacement); | 77 | void setArg(const std::string& key, const std::string& replacement); |
75 | 78 | ||
76 | const std::string& getString() const { return mResult; } | 79 | const std::string& getString() const { return mResult; } |