diff options
author | Don Kjer <don@lindenlab.com> | 2011-04-26 18:01:18 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-04-26 18:01:18 +0000 |
commit | c14b5c644d75df31a1ef151262480cf875134da2 (patch) | |
tree | 9284620a254873585b637f625456c88e9e371436 /indra/newview/llviewermessage.cpp | |
parent | 77791a88a9811f71cc9af668d28a903645436be0 (diff) | |
parent | b87cb90a55ed74d51587eec581fb57e29f510c41 (diff) |
Merge with viewer-development
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r-- | indra/newview/llviewermessage.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 5792bf2c03..5802ac1d12 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -5519,7 +5519,11 @@ void process_alert_core(const std::string& message, BOOL modal) { LLSD args; std::string new_msg =LLNotifications::instance().getGlobalString(message); - args["MESSAGE"] = new_msg; + + std::string localized_msg; + bool is_message_localized = LLTrans::findString(localized_msg, new_msg); + + args["MESSAGE"] = is_message_localized ? localized_msg : new_msg; LLNotificationsUtil::add("SystemMessageTip", args); } } |