diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-04-19 17:50:48 +0300 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-04-19 17:50:48 +0300 |
| commit | cfd132a0def48a3dff62aebc480feeb4639babea (patch) | |
| tree | 6d57e930162bf4d51652a07d18e68c4202e38734 /indra/newview/llfloaterimsession.cpp | |
| parent | 6a339649844a6e016e35e440004a61d07dd490e6 (diff) | |
| parent | 09b70845e52f75a33c608062db6516784b31fa72 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloaterimsession.cpp')
| -rw-r--r-- | indra/newview/llfloaterimsession.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimsession.cpp b/indra/newview/llfloaterimsession.cpp index edc25a7d7e..6ed04f8716 100644 --- a/indra/newview/llfloaterimsession.cpp +++ b/indra/newview/llfloaterimsession.cpp @@ -469,7 +469,10 @@ void LLFloaterIMSession::addP2PSessionParticipants(const LLSD& notification, con temp_ids.insert(temp_ids.end(), uuids.begin(), uuids.end()); // then we can close the current session - onClose(false); + if(findInstance(mSessionID)) + { + onClose(false); + } // we start a new session so reset the initialization flag mSessionInitialized = false; |