diff options
| author | Andrew Productengine <adyukov@productengine.com> | 2010-09-27 18:18:03 +0300 |
|---|---|---|
| committer | Andrew Productengine <adyukov@productengine.com> | 2010-09-27 18:18:03 +0300 |
| commit | 09ef4a2417f8400b03185adec859edd76e59823a (patch) | |
| tree | 682c4d75ff5617370a0c9b1eba6a3dc54a271345 /indra/newview/llimview.cpp | |
| parent | 2f29c3511422e29bbdefa43af2fc3fc785c38c86 (diff) | |
STORM-153 ADDITIONAL FIX Properly fixed unlocalized chiclet tooltip and syswell session names for adhoc.
Bug was caused by using unlocalized name of session as argument in LLIMModel::newSession() after the session name was localized in constructor.
- Used correct session name in LLIMModel::newSession(). Adding similar logic to addMessage() turned out to be unnecessary and also caused regression (VWR-23180),
so previous fix of the same bug(8ab901af1241) was backed out in 28ed1b4cf4cd. Erroneous part was excluded from this fix.
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 493398c68a..494b5d1e56 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -622,7 +622,10 @@ bool LLIMModel::newSession(const LLUUID& session_id, const std::string& name, co LLIMSession* session = new LLIMSession(session_id, name, type, other_participant_id, ids, voice); mId2SessionMap[session_id] = session; - LLIMMgr::getInstance()->notifyObserverSessionAdded(session_id, name, other_participant_id); + // When notifying observer, name of session is used instead of "name", because they may not be the + // same if it is an adhoc session (in this case name is localized in LLIMSession constructor). + std::string session_name = LLIMModel::getInstance()->getName(session_id); + LLIMMgr::getInstance()->notifyObserverSessionAdded(session_id, session_name, other_participant_id); return true; |