[GroupBan] [MAINT-3722] - Banning from 'banned agents' tab does not eject them from the group

- Banning a resident from the "Banned Agents" tab should not properly eject them from the group.
- Renamed "Banned Agents" to "Banned Residents".  Updated tool tip as well.
- You should now receive an eject notification when banning an agent from the "Banned Residents" tab.
Baker Linden 2014-04-08 16:34:49 -07:00
parent c02d80f403
commit 1ca5dd4076
3 changed files with 19 additions and 3 deletions

View File

@ -1905,7 +1905,7 @@ void LLGroupMgr::sendGroupBanRequest( EBanRequestType request_type,
LLSD body = LLSD::emptyMap();
body["ban_action"] = ban_action;
// Add our list of potential banned agents to the list
// Add our list of potential banned residents to the list
body["ban_ids"] = LLSD::emptyArray();
LLSD ban_entry;

View File

@ -40,6 +40,7 @@
#include "llnamelistctrl.h"
#include "llnotificationsutil.h"
#include "llscrolllistitem.h"
#include "llslurl.h"
#include "llspinctrl.h"
#include "lltextbox.h"
#include "llviewerobject.h"
@ -136,7 +137,22 @@ void LLPanelGroupBulkBan::submit()
}
LLGroupMgr::getInstance()->sendGroupBanRequest(LLGroupMgr::REQUEST_POST, mImplementation->mGroupID, LLGroupMgr::BAN_CREATE, banned_agent_list);
LLGroupMgr::getInstance()->sendGroupMemberEjects(mImplementation->mGroupID, banned_agent_list);
// Viewer notification
LLGroupMgrGroupData* group_data = LLGroupMgr::getInstance()->getGroupData(mImplementation->mGroupID);
if (group_data)
{
for (uuid_vec_t::const_iterator i = banned_agent_list.begin(); i != banned_agent_list.end(); ++i)
{
LLSD args;
args["AVATAR_NAME"] = LLSLURL("agent", *i, "displayname").getSLURLString();
args["GROUP_NAME"] = group_data->mName;
LLNotifications::instance().add(LLNotification::Params("EjectAvatarFromGroup").substitutions(args));
}
}
//then close
(*(mImplementation->mCloseCallback))(mImplementation->mCloseCallbackUserData);
}

View File

@ -291,14 +291,14 @@ clicking on their names.
<panel
border="false"
height="303"
label="BANNED AGENTS"
label="BANNED RESIDENTS"
layout="topleft"
left="0"
right="-1"
help_topic="roles_banlist_tab"
name="banlist_sub_tab"
class="panel_group_banlist_subtab"
tool_tip="View the banned agents from this group."
tool_tip="View the banned residents from this group."
width="310">
<panel.string
name="help_text">