diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-09-29 19:14:50 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-09-29 19:14:50 +0000 |
| commit | d725e5b24075b2171f8a5b263969991e9b475078 (patch) | |
| tree | f1422064fd0ab676dfa66d39b5d0f0b9e8ff1086 /indra/newview/llimview.cpp | |
| parent | 66739da16407a8e56accc236bd3996c1963a6bcf (diff) | |
QAR-872 Viewer 1.21 RC 3
merge viewer_1-21 96116-97380 -> release
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index f1b3182cac..c33de4c457 100644 --- a/indra/newview/llimview.cpp +++ b/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()); |