diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2015-07-10 19:46:51 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2015-07-10 19:46:51 -0400 |
commit | d215de3b7d672dcb5da41600c2b5d0abe2cb82ce (patch) | |
tree | eb12d68e18684eb5dd6f4cb309c039f5bc52ed11 /indra/newview/llgroupmgr.h | |
parent | 91f636f23a6db27c4ca4c5df2325a7053ca3044e (diff) | |
parent | 68f42e4e102bd578386aeec3485233e332cbdcff (diff) |
Automated merge with ssh://bitbucket.org/rider_linden/maint-4952-v-t-u
Diffstat (limited to 'indra/newview/llgroupmgr.h')
-rwxr-xr-x | indra/newview/llgroupmgr.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llgroupmgr.h b/indra/newview/llgroupmgr.h index 1163923eff..fd0c2de854 100755 --- a/indra/newview/llgroupmgr.h +++ b/indra/newview/llgroupmgr.h @@ -428,11 +428,11 @@ public: void clearGroupData(const LLUUID& group_id); private: - void groupMembersRequestCoro(LLCoros::self& self, std::string url, LLUUID groupId); + void groupMembersRequestCoro(std::string url, LLUUID groupId); void processCapGroupMembersRequest(const LLSD& content); - void getGroupBanRequestCoro(LLCoros::self& self, std::string url, LLUUID groupId); - void postGroupBanRequestCoro(LLCoros::self& self, std::string url, LLUUID groupId, U32 action, uuid_vec_t banList, bool update); + void getGroupBanRequestCoro(std::string url, LLUUID groupId); + void postGroupBanRequestCoro(std::string url, LLUUID groupId, U32 action, uuid_vec_t banList, bool update); static void processGroupBanRequest(const LLSD& content); |