diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-21 18:18:38 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-21 18:18:38 +0200 |
| commit | d43a03d5c8a71e5c16154289c15641aa1635b527 (patch) | |
| tree | 8d4770d89dff544a4bb3a01b4701772cd3fc2257 /indra/newview/llimview.cpp | |
| parent | aa56836ab7537e3afad53c03da455e2e7dacb87a (diff) | |
| parent | 2af9653f0a17122fb38d5bfeb8dae04163d72c05 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 10 |
1 files changed, 5 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", |