diff options
| -rw-r--r-- | indra/newview/llimview.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 14 |
2 files changed, 19 insertions, 5 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index f5362acbfe..8917cc11e1 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1227,15 +1227,15 @@ LLIMMgr::showSessionEventError( const std::string& error_string, const LLUUID session_id) { - const LLFloater* floater = getFloaterBySessionID (session_id); - if (!floater) return; - LLSD args; + LLStringUtil::format_map_t event_args; + + event_args["RECIPIENT"] = LLIMModel::getInstance()->getName(session_id); + args["REASON"] = LLTrans::getString(error_string); args["EVENT"] = - LLTrans::getString(event_string); - args["RECIPIENT"] = floater->getTitle(); + LLTrans::getString(event_string, event_args); LLNotificationsUtil::add( "ChatterBoxSessionEventError", diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index a1f2548f81..9aae04ba38 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2964,12 +2964,26 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="not_a_mod_error"> You are not a session moderator. </string> + <!--Some times string name is getting from the body of server response. + For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post. + In case of the EXT-3562 issue 'muted' is passed into the gIMMgr::showSessionStartError as a string name. + So, let add string with name="muted" with the same value as "muted_error" --> + <string name="muted"> + A group moderator disabled your text chat. + </string> <string name="muted_error"> A group moderator disabled your text chat. </string> <string name="add_session_event"> Unable to add users to chat session with [RECIPIENT]. </string> + <!--Some times string name is getting from the body of server response. + For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post. + In case of the EXT-3562 issue 'message' is passed into the gIMMgr::showSessionStartError as a string name. + So, let add string with name="message" with the same value as "message_session_event" --> + <string name="message"> + Unable to send your message to the chat session with [RECIPIENT]. + </string> <string name="message_session_event"> Unable to send your message to the chat session with [RECIPIENT]. </string> |