Added Eject avatar from group notification from v-r.
This commit is contained in:
@@ -1083,10 +1083,29 @@ void LLPanelGroupMembersSubTab::handleEjectMembers()
|
||||
|
||||
mMembersList->deleteSelectedItems();
|
||||
|
||||
sendEjectNotifications(mGroupID, selected_members);
|
||||
|
||||
LLGroupMgr::getInstance()->sendGroupMemberEjects(mGroupID,
|
||||
selected_members);
|
||||
}
|
||||
|
||||
void LLPanelGroupMembersSubTab::sendEjectNotifications(const LLUUID& group_id, const uuid_vec_t& selected_members)
|
||||
{
|
||||
LLGroupMgrGroupData* group_data = LLGroupMgr::getInstance()->getGroupData(group_id);
|
||||
|
||||
if (group_data)
|
||||
{
|
||||
for (uuid_vec_t::const_iterator i = selected_members.begin(); i != selected_members.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));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void LLPanelGroupMembersSubTab::handleRoleCheck(const LLUUID& role_id,
|
||||
LLRoleMemberChangeType type)
|
||||
{
|
||||
|
||||
@@ -176,6 +176,7 @@ public:
|
||||
|
||||
static void onEjectMembers(void*);
|
||||
void handleEjectMembers();
|
||||
void sendEjectNotifications(const LLUUID& group_id, const uuid_vec_t& selected_members);
|
||||
|
||||
static void onRoleCheck(LLUICtrl* check, void* user_data);
|
||||
void handleRoleCheck(const LLUUID& role_id,
|
||||
|
||||
@@ -1572,6 +1572,15 @@ Eject [AVATAR_NAME] from your land?
|
||||
yestext="Eject"/>
|
||||
</notification>
|
||||
|
||||
<notification
|
||||
icon="alertmodal.tga"
|
||||
name="EjectAvatarFromGroup"
|
||||
persist="true"
|
||||
type="notifytip">
|
||||
You ejected [AVATAR_NAME] from group [GROUP_NAME]
|
||||
<tag>group</tag>
|
||||
</notification>
|
||||
|
||||
<notification
|
||||
icon="alertmodal.tga"
|
||||
name="AcquireErrorTooManyObjects"
|
||||
|
||||
Reference in New Issue
Block a user