diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-27 16:56:01 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-27 16:56:01 +0100 |
| commit | 595cbb77d250e3df2ba8caa66ad9c940430a8d3f (patch) | |
| tree | 2a2da6d5460def48fbb8f529dab051d81ad8efd0 /indra | |
| parent | 980f1110723476acd3aea4d184bdab12d529542b (diff) | |
| parent | 09ef4a2417f8400b03185adec859edd76e59823a (diff) | |
merge storm-153 re-fix.
Diffstat (limited to 'indra')
| -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; |