[LLIMMgr/LLIMPanel Revision] Two last things

Handle display of popped out IM floaters better
send_start_session_messages(): cut early if ids is empty, fallback on UDP if there is a region but there isn't ChatSessionRequest Cap
This commit is contained in:
Inusaito Sayori
2013-10-10 04:21:19 -04:00
parent 363fa450fb
commit 2f334b021f
2 changed files with 8 additions and 5 deletions

View File

@@ -157,10 +157,13 @@ public:
if ((mInvitiationType == LLIMMgr::INVITATION_TYPE_VOICE
|| mInvitiationType == LLIMMgr::INVITATION_TYPE_IMMEDIATE)
&& gIMMgr->hasSession(mSessionID))
&& floater)
{
// always open IM window when connecting to voice
LLFloaterChatterBox::showInstance(TRUE);
if (floater->getParent() == gFloaterView)
floater->open();
else
LLFloaterChatterBox::showInstance(TRUE);
}
gIMMgr->clearPendingAgentListUpdates(mSessionID);