From 970ee73e9a9cd1c94c295c9decb4d632886c19e6 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Fri, 25 Oct 2013 11:48:43 -0700 Subject: Fix release merge issues (included upstream changes not yet in release from bear) --- indra/newview/llfloatergroupinvite.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'indra/newview/llfloatergroupinvite.cpp') diff --git a/indra/newview/llfloatergroupinvite.cpp b/indra/newview/llfloatergroupinvite.cpp index 0c735dec1f..49da4e64b3 100755 --- a/indra/newview/llfloatergroupinvite.cpp +++ b/indra/newview/llfloatergroupinvite.cpp @@ -30,7 +30,6 @@ #include "llpanelgroupinvite.h" #include "lltrans.h" #include "lldraghandle.h" -#include "llgroupmgr.h" class LLFloaterGroupInvite::impl { @@ -124,11 +123,6 @@ void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, uuid_vec_t *agen LLFloaterGroupInvite *fgi = get_if_there(impl::sInstances, group_id, (LLFloaterGroupInvite*)NULL); - - // refresh group information - LLGroupMgr::getInstance()->clearGroupData(group_id); - - if (!fgi) { fgi = new LLFloaterGroupInvite(group_id); -- cgit v1.2.3