diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-10-25 11:48:43 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-10-25 11:48:43 -0700 |
| commit | 970ee73e9a9cd1c94c295c9decb4d632886c19e6 (patch) | |
| tree | 18cc7f08bbc043252bea9a6f687807116585d286 /indra/newview/llfloatergroupinvite.cpp | |
| parent | d4e622daf2775147c75a75389ffb9b55f8cef799 (diff) | |
Fix release merge issues (included upstream changes not yet in release from bear)
Diffstat (limited to 'indra/newview/llfloatergroupinvite.cpp')
| -rwxr-xr-x | indra/newview/llfloatergroupinvite.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
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); |