diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-04-22 23:22:09 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-04-22 23:22:09 -0700 |
| commit | 244734647c38f256ace2d64fde4d3149d37e0e25 (patch) | |
| tree | 546632cef0b87ec329966adfe03e568b49877a21 /indra/newview/llfloaterimsession.cpp | |
| parent | 022dd124604c8a0a3d83b481d03a687556fcf2c4 (diff) | |
| parent | 6ad4822a05fa2d0cb0a9ab616384b374dc877883 (diff) | |
Pull merge from lindenlab/viewer-chui
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; |