diff options
author | Oz Linden <oz@lindenlab.com> | 2015-10-13 08:43:03 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2015-10-13 08:43:03 -0400 |
commit | 69ff937e47248eca0a4f876efebe97ee57bd4da9 (patch) | |
tree | 4fde61ed0ed439b0bf033b15f6703d72bee6f561 /indra/newview/llpanelgrouproles.h | |
parent | 9367a3787929dfff8b46763d9a7b4872c469e85a (diff) | |
parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) |
merge changes for 3.8.5-release
Diffstat (limited to 'indra/newview/llpanelgrouproles.h')
-rwxr-xr-x | indra/newview/llpanelgrouproles.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llpanelgrouproles.h b/indra/newview/llpanelgrouproles.h index 540b24ada6..9a696124a8 100755 --- a/indra/newview/llpanelgrouproles.h +++ b/indra/newview/llpanelgrouproles.h @@ -171,6 +171,7 @@ public: void handleEjectMembers(); void sendEjectNotifications(const LLUUID& group_id, const uuid_vec_t& selected_members); bool handleEjectCallback(const LLSD& notification, const LLSD& response); + void confirmEjectMembers(); static void onRoleCheck(LLUICtrl* check, void* user_data); void handleRoleCheck(const LLUUID& role_id, @@ -178,6 +179,8 @@ public: static void onBanMember(void* user_data); void handleBanMember(); + bool handleBanCallback(const LLSD& notification, const LLSD& response); + void confirmBanMembers(); void applyMemberChanges(); |