diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-05-09 18:00:23 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-05-09 18:00:23 -0400 |
| commit | 77c39cef5292ca9fcd13aafeb074ef2b715baed8 (patch) | |
| tree | 90e19b4b9c73d9f9721bc628f50cf5de6829a0ba /indra/newview/llviewermessage.cpp | |
| parent | 0994f9485534c35ca92b4ce1421544b7de8feea2 (diff) | |
| parent | f7bd5b98949fc72ac1fd4b97ecd4907e14c04315 (diff) | |
merged .hgtags from viewer-pre-beta
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 9641a0901c..d0fdae1e1b 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -5523,7 +5523,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); } } |