diff options
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llgroupmgr.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llpanelgroupbulkban.cpp | 16 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/panel_group_roles.xml | 4 |
3 files changed, 19 insertions, 3 deletions
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp index 290b0d6f15..7288dddd3d 100755 --- a/indra/newview/llgroupmgr.cpp +++ b/indra/newview/llgroupmgr.cpp @@ -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; diff --git a/indra/newview/llpanelgroupbulkban.cpp b/indra/newview/llpanelgroupbulkban.cpp index 3b442036fa..6518137649 100644 --- a/indra/newview/llpanelgroupbulkban.cpp +++ b/indra/newview/llpanelgroupbulkban.cpp @@ -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); } diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index bcce549b60..ea619e6319 100755 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -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"> |