From 667ca55bad0108c4bdf8f007b89e1a52fc766aad Mon Sep 17 00:00:00 2001 From: Kent Quirk Date: Mon, 5 Jan 2009 18:59:12 +0000 Subject: svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. --- indra/llui/lluistring.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'indra/llui/lluistring.cpp') diff --git a/indra/llui/lluistring.cpp b/indra/llui/lluistring.cpp index 0dde20934c..51768ad885 100644 --- a/indra/llui/lluistring.cpp +++ b/indra/llui/lluistring.cpp @@ -31,6 +31,7 @@ #include "linden_common.h" #include "lluistring.h" +#include "llsd.h" const LLStringUtil::format_map_t LLUIString::sNullArgs; @@ -54,6 +55,18 @@ void LLUIString::setArgList(const LLStringUtil::format_map_t& args) format(); } +void LLUIString::setArgs(const LLSD& sd) +{ + if (!sd.isMap()) return; + for(LLSD::map_const_iterator sd_it = sd.beginMap(); + sd_it != sd.endMap(); + ++sd_it) + { + setArg(sd_it->first, sd_it->second.asString()); + } + format(); +} + void LLUIString::setArg(const std::string& key, const std::string& replacement) { mArgs[key] = replacement; -- cgit v1.2.3