Merge branch 'merge-1.21.6' into rebranding

Conflicts:
	linden/indra/newview/installers/windows/installer_template.nsi
	linden/indra/newview/llappviewer.cpp

1 files changed, 5 insertions, 11 deletions

diff --git a/linden/indra/newview/llimview.cpp b/linden/indra/newview/llimview.cpp
index 309e479..21d8e1f 100644
--- a/linden/indra/newview/llimview.cpp
+++ b/linden/indra/newview/llimview.cpp
@@ -157,10 +157,10 @@ BOOL LLFloaterIM::postBuild()
 {
         // IM session initiation warnings
         sOnlyUserMessage = getString("only_user_message");
-        sOfflineMessage = getUIString("offline_message");
-        sMutedMessage = getUIString("muted_message");
+        sOfflineMessage = getString("offline_message");
+        sMutedMessage = getString("muted_message");
 
-        sInviteMessage = getUIString("invite_message");
+        sInviteMessage = getString("invite_message");
 
         if ( sErrorStringsMap.find("generic") == sErrorStringsMap.end() )
         {
@@ -216,12 +216,6 @@ BOOL LLFloaterIM::postBuild()
         }
 
 
-        if ( sEventStringsMap.end() == sEventStringsMap.find("mute") )
-        {
-                sEventStringsMap["mute"] =
-                        getString("mute_agent_event");
-        }
-
         if ( sForceCloseSessionMap.end() ==
                  sForceCloseSessionMap.find("removed") )
         {
@@ -525,7 +519,7 @@ void LLIMMgr::addSystemMessage(const LLUUID& session_id, const std::string& mess
         {
                 LLFloaterChat* floaterp = LLFloaterChat::getInstance();
 
-                message = floaterp->getUIString(message_name);
+                message = floaterp->getString(message_name);
                 message.setArgList(args);
 
                 LLChat chat(message);
@@ -537,7 +531,7 @@ void LLIMMgr::addSystemMessage(const LLUUID& session_id, const std::string& mess
                 LLFloaterIMPanel* floaterp = findFloaterBySession(session_id);
                 if (floaterp)
                 {
-                        message = floaterp->getUIString(message_name);
+                        message = floaterp->getString(message_name);
                         message.setArgList(args);
 
                         gIMMgr->addMessage(session_id, LLUUID::null, SYSTEM_FROM, message.getString());