diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-03-18 09:43:16 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-03-18 09:43:16 -0700 |
| commit | a17ed876c8c55cb4f8977f5dbcec4ae99df98d70 (patch) | |
| tree | 0a05c65995f984058d940574a8bb7e4be3a58065 /indra/newview/llimview.cpp | |
| parent | 0a0ba068bf5bc6d829440a12946174c6ed961843 (diff) | |
| parent | a079acf1aa3b7cfe8ee35bb7afdbae83df0df5ca (diff) | |
merge
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index aadc61c4f5..10e214bc90 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -655,8 +655,7 @@ void LLIMModel::LLIMSession::loadHistory() LLIMModel::LLIMSession* LLIMModel::findIMSession(const LLUUID& session_id) const { - return get_if_there(mId2SessionMap, session_id, - (LLIMModel::LLIMSession*) NULL); + return get_if_there(mId2SessionMap, session_id, (LLIMModel::LLIMSession*) NULL); } //*TODO consider switching to using std::set instead of std::list for holding LLUUIDs across the whole code @@ -2823,7 +2822,7 @@ LLUUID LLIMMgr::addSession( } } - bool new_session = !LLIMModel::getInstance()->findIMSession(session_id); + bool new_session = (LLIMModel::getInstance()->findIMSession(session_id) == NULL); //works only for outgoing ad-hoc sessions if (new_session && IM_SESSION_CONFERENCE_START == dialog && ids.size()) |