[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:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user