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/llimpanel.cpp | |
| parent | 66739da16407a8e56accc236bd3996c1963a6bcf (diff) | |
QAR-872 Viewer 1.21 RC 3
merge viewer_1-21 96116-97380 -> release
Diffstat (limited to 'indra/newview/llimpanel.cpp')
| -rw-r--r-- | indra/newview/llimpanel.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index ca5dd7be36..9538efdc37 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -2172,7 +2172,7 @@ void LLFloaterIMPanel::removeTypingIndicator(const LLIMInfo* im_info) void LLFloaterIMPanel::chatFromLogFile(LLLogChat::ELogLineType type, std::string line, void* userdata) { LLFloaterIMPanel* self = (LLFloaterIMPanel*)userdata; - LLUIString message = line; + std::string message = line; switch (type) { @@ -2180,14 +2180,14 @@ void LLFloaterIMPanel::chatFromLogFile(LLLogChat::ELogLineType type, std::string // add warning log enabled message if (gSavedPerAccountSettings.getBOOL("LogInstantMessages")) { - message = LLFloaterChat::getInstance()->getUIString("IM_logging_string"); + message = LLFloaterChat::getInstance()->getString("IM_logging_string"); } break; case LLLogChat::LOG_END: // add log end message if (gSavedPerAccountSettings.getBOOL("LogInstantMessages")) { - message = LLFloaterChat::getInstance()->getUIString("IM_logging_string"); + message = LLFloaterChat::getInstance()->getString("IM_logging_string"); } break; case LLLogChat::LOG_LINE: @@ -2232,11 +2232,16 @@ void LLFloaterIMPanel::showSessionEventError( const std::string& error_string) { LLStringUtil::format_map_t args; - args["[REASON]"] = - LLFloaterIM::sErrorStringsMap[error_string]; - args["[EVENT]"] = - LLFloaterIM::sEventStringsMap[event_string]; + std::string event; + + event = LLFloaterIM::sEventStringsMap[event_string]; args["[RECIPIENT]"] = getTitle(); + LLStringUtil::format(event, args); + + + args = LLStringUtil::format_map_t(); + args["[REASON]"] = LLFloaterIM::sErrorStringsMap[error_string]; + args["[EVENT]"] = event; gViewerWindow->alertXml( "ChatterBoxSessionEventError", |