summaryrefslogtreecommitdiff
path: root/indra/newview/llgroupmgr.cpp
diff options
context:
space:
mode:
authorcallum_linden <none@none>2015-08-31 11:17:28 -0700
committercallum_linden <none@none>2015-08-31 11:17:28 -0700
commit1db2c7276d0bb1039ad8be9240201732ad5387cd (patch)
treea2bc6f6f80772cc459f23a075ba3bc0b75b5de48 /indra/newview/llgroupmgr.cpp
parent0ad81961cd5aea97231959fd31daa22dd2d8908a (diff)
parent1be63209331d509396bd7ee79302d511fe83d72e (diff)
Merge with viewer-release
Diffstat (limited to 'indra/newview/llgroupmgr.cpp')
-rwxr-xr-xindra/newview/llgroupmgr.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index 56e671d902..86f9da6318 100755
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -1970,7 +1970,8 @@ void LLGroupMgr::processGroupBanRequest(const LLSD& content)
LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(group_id);
if (!gdatap)
return;
-
+
+ gdatap->clearBanList();
LLSD::map_const_iterator i = content["ban_list"].beginMap();
LLSD::map_const_iterator iEnd = content["ban_list"].endMap();
for(;i != iEnd; ++i)