1 files changed, 12 insertions, 8 deletions

diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp
index 24ae90e3ae..1128939e29 100644
--- a/indra/newview/llgroupactions.cpp
+++ b/indra/newview/llgroupactions.cpp
@@ -37,6 +37,7 @@
 #include "llfloatersidepanelcontainer.h"
 #include "llgroupmgr.h"
 #include "llfloaterimcontainer.h"
+#include "llfloaterimsession.h"
 #include "llimview.h" // for gIMMgr
 #include "llnotificationsutil.h"
 #include "llstartup.h"
@@ -46,7 +47,7 @@
 //
 // Globals
 //
-static GroupChatListener sGroupChatListener;
+static LLGroupChatListener sGroupChatListener;
 
 class LLGroupHandler : public LLCommandHandler
 {
@@ -118,7 +119,7 @@ public:
         }
 
         LLUUID group_id;
-        if (!group_id.set(tokens[0], FALSE))
+        if (!group_id.set(tokens[0], false))
         {
             return false;
         }
@@ -186,7 +187,7 @@ public:
             }
             else if (!gdatap->isMemberDataComplete())
             {
-                LL_WARNS() << "LLGroupMgr::getInstance()->getGroupData()->isMemberDataComplete() was FALSE" << LL_ENDL;
+                LL_WARNS() << "LLGroupMgr::getInstance()->getGroupData()->isMemberDataComplete() was false" << LL_ENDL;
                 processGroupData();
                 mRequestProcessed = true;
             }
@@ -248,7 +249,7 @@ void LLGroupActions::startCall(const LLUUID& group_id)
         return;
     }
 
-    LLUUID session_id = gIMMgr->addSession(gdata.mName, IM_SESSION_GROUP_START, group_id, true);
+    LLUUID session_id = gIMMgr->addSession(gdata.mName, IM_SESSION_GROUP_START, group_id, LLSD());
     if (session_id == LLUUID::null)
     {
         LL_WARNS() << "Error adding session" << LL_ENDL;
@@ -370,8 +371,8 @@ void LLGroupActions::processLeaveGroupDataResponse(const LLUUID group_id)
     if (gdatap->mMembershipFee > 0)
     {
         args["COST"] = gdatap->mMembershipFee;
-        LLNotificationsUtil::add("GroupLeaveConfirmMember", args, payload, onLeaveGroup);
-    }
+    LLNotificationsUtil::add("GroupLeaveConfirmMember", args, payload, onLeaveGroup);
+}
     else
     {
         LLNotificationsUtil::add("GroupLeaveConfirmMemberNoFee", args, payload, onLeaveGroup);
@@ -425,7 +426,7 @@ void LLGroupActions::show(const LLUUID &group_id, bool expand_notices_tab)
     LLFloater *floater = LLFloaterReg::getTypedInstance<LLFloaterSidePanelContainer>("people");
     if (!floater->isFrontmost())
     {
-        floater->setVisibleAndFrontmost(TRUE, params);
+        floater->setVisibleAndFrontmost(true, params);
     }
 }
 
@@ -519,7 +520,10 @@ void LLGroupActions::endIM(const LLUUID& group_id)
     LLUUID session_id = gIMMgr->computeSessionID(IM_SESSION_GROUP_START, group_id);
     if (session_id != LLUUID::null)
     {
-        gIMMgr->leaveSession(session_id);
+        if (LLFloaterIMSession *conversationFloater = LLFloaterIMSession::findInstance(session_id))
+        {
+            LLFloater::onClickClose(conversationFloater);
+        }
     }
 }