summaryrefslogtreecommitdiff
path: root/indra/newview/llgroupmgr.h
diff options
context:
space:
mode:
authorBaker Linden <baker@lindenlab.com>2013-09-13 17:20:04 -0700
committerBaker Linden <baker@lindenlab.com>2013-09-13 17:20:04 -0700
commit34f561db55868185f0a946009f41f4f212366484 (patch)
treea6637f68a05acf87d0326bcf9d1a4013e852cc6f /indra/newview/llgroupmgr.h
parentbf34eccf9c68f204c41d3daea791e50e87d868db (diff)
- Added ban date to ban list ui
- Code cleanup
Diffstat (limited to 'indra/newview/llgroupmgr.h')
-rwxr-xr-xindra/newview/llgroupmgr.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/indra/newview/llgroupmgr.h b/indra/newview/llgroupmgr.h
index 7e3297b757..ba767b91ad 100755
--- a/indra/newview/llgroupmgr.h
+++ b/indra/newview/llgroupmgr.h
@@ -195,10 +195,10 @@ struct lluuid_pair_less
struct LLGroupBanData
{
- LLGroupBanData() { mBanDate = "00/00/0000"; }
+ LLGroupBanData(): mBanDate() {}
~LLGroupBanData() {}
- std::string mBanDate; // Just store something here to ensure it works.
+ LLDate mBanDate; // Just store something here to ensure it works.
};
@@ -248,11 +248,7 @@ public:
const LLUUID& getMemberVersion() const { return mMemberVersion; }
- //////////////////////////////////////////////////////////////////////////
- // BAN LIST
- //////////////////////////////////////////////////////////////////////////
void clearBanList() { mBanList.clear(); }
-
void getBanList(const LLUUID& group_id, LLGroupBanData& ban_data);
const LLGroupBanData& getBanEntry(const LLUUID& ban_id) { return mBanList[ban_id]; }
@@ -383,7 +379,7 @@ public:
static void sendGroupMemberInvites(const LLUUID& group_id, std::map<LLUUID,LLUUID>& role_member_pairs);
static void sendGroupMemberEjects(const LLUUID& group_id,
uuid_vec_t& member_ids);
- // BAKER - Group Ban
+
static void sendGroupBanRequest(EBanRequestType request_type,
const LLUUID& group_id,
EBanRequestAction ban_action = BAN_NO_ACTION,
@@ -391,7 +387,6 @@ public:
static void processGroupBanRequest(const LLSD& content);
- // BAKER
void sendCapGroupMembersRequest(const LLUUID& group_id);
static void processCapGroupMembersRequest(const LLSD& content);