From 15fefc231b1d8858199bb9f1a13b885dbf859e24 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Fri, 22 Nov 2013 18:09:13 -0500 Subject: [PATCH] [LLIMMgr/LLIMPanel] isInviteAllowed should return based on mSessionType, not on mDialog. --- indra/newview/llimpanel.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index d1c62c856..af8ee0a32 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -949,9 +949,7 @@ BOOL LLFloaterIMPanel::dropCategory(LLInventoryCategory* category, BOOL drop) bool LLFloaterIMPanel::isInviteAllowed() const { - - return ( (IM_SESSION_CONFERENCE_START == mDialog) - || (IM_SESSION_INVITE == mDialog) ); + return mSessionType != P2P_SESSION; } void LLFloaterIMPanel::removeDynamics(LLComboBox* flyout)