diff options
author | Rider Linden <rider@lindenlab.com> | 2015-07-02 09:22:05 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2015-07-02 09:22:05 -0700 |
commit | d785ec312bb7f4e77517eb44f46f276ba0129677 (patch) | |
tree | 9686020c06681328d7150ef6a89d975bd2d418ce /indra/newview/llgroupmgr.h | |
parent | f8a7eda55bdd34eeb2fafed21d23d26cd25f924d (diff) | |
parent | 2a29dbc48295ad24a8a7137a10b9d891debea978 (diff) |
Merge
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); |