diff options
author | Baker Linden <baker@lindenlab.com> | 2014-04-08 16:34:49 -0700 |
---|---|---|
committer | Baker Linden <baker@lindenlab.com> | 2014-04-08 16:34:49 -0700 |
commit | 1ca5dd40765211dc993393caa0003cfa7505c1f5 (patch) | |
tree | c28a914aecb8740bc730d831d19d3405ec5e439f /indra/newview/llpanelgroupbulkban.cpp | |
parent | c02d80f403efed88b464619c91a165be7c7b88d9 (diff) |
[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.
Diffstat (limited to 'indra/newview/llpanelgroupbulkban.cpp')
-rw-r--r-- | indra/newview/llpanelgroupbulkban.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
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); } |