1 files changed, 19 insertions, 19 deletions

diff --git a/indra/newview/llgroupmgr.h b/indra/newview/llgroupmgr.h
index 0d25e8fb22..3d0f67c6f3 100644
--- a/indra/newview/llgroupmgr.h
+++ b/indra/newview/llgroupmgr.h
@@ -84,14 +84,14 @@ public:
 						U64 agent_powers,
 						const std::string& title,
 						const std::string& online_status,
-						BOOL is_owner);
+						bool is_owner);
 
 	~LLGroupMemberData();
 
 	const LLUUID& getID() const { return mID; }
 	S32 getContribution() const { return mContribution; }
 	U64	getAgentPowers() const { return mAgentPowers; }
-	BOOL isOwner() const { return mIsOwner; }
+	bool isOwner() const { return mIsOwner; }
 	const std::string& getTitle() const { return mTitle; }
 	const std::string& getOnlineStatus() const { return mOnlineStatus; }
 	void addRole(const LLUUID& role, LLGroupRoleData* rd);
@@ -100,7 +100,7 @@ public:
 	role_list_t::iterator roleBegin() { return mRolesList.begin(); }
 	role_list_t::iterator roleEnd() { return mRolesList.end(); }
 
-	BOOL isInRole(const LLUUID& role_id) { return (mRolesList.find(role_id) != mRolesList.end()); }
+	bool isInRole(const LLUUID& role_id) { return (mRolesList.find(role_id) != mRolesList.end()); }
 
 private:
 	LLUUID	mID;
@@ -108,7 +108,7 @@ private:
 	U64		mAgentPowers;
 	std::string	mTitle;
 	std::string	mOnlineStatus;
-	BOOL	mIsOwner;
+	bool	mIsOwner;
 	role_list_t mRolesList;
 };
 
@@ -150,7 +150,7 @@ public:
 	const LLUUID& getID() const { return mRoleID; }
 
 	const uuid_vec_t& getRoleMembers() const { return mMemberIDs; }
-	S32 getMembersInRole(uuid_vec_t members, BOOL needs_sort = TRUE);
+	S32 getMembersInRole(uuid_vec_t members, bool needs_sort = true);
 	S32 getTotalMembersInRole() { return mMemberCount ? mMemberCount : mMemberIDs.size(); } //FIXME: Returns 0 for Everyone role when Member list isn't yet loaded, see MAINT-5225
 
 	LLRoleData getRoleData() const { return mRoleData; }
@@ -169,7 +169,7 @@ public:
 
 protected:
 	LLGroupRoleData()
-	: mMemberCount(0), mMembersNeedsSort(FALSE) {}
+	: mMemberCount(0), mMembersNeedsSort(false) {}
 
 	LLUUID mRoleID;
 	LLRoleData	mRoleData;
@@ -178,7 +178,7 @@ protected:
 	S32	mMemberCount;
 
 private:
-	BOOL mMembersNeedsSort;
+	bool mMembersNeedsSort;
 };
 
 struct LLRoleMemberChange
@@ -221,7 +221,7 @@ struct LLGroupTitle
 {
 	std::string mTitle;
 	LLUUID		mRoleID;
-	BOOL		mSelected;
+	bool		mSelected;
 };
 
 class LLGroupMgrGroupData
@@ -234,11 +234,11 @@ public:
 
 	const LLUUID& getID() { return mID; }
 
-	BOOL getRoleData(const LLUUID& role_id, LLRoleData& role_data);
+	bool getRoleData(const LLUUID& role_id, LLRoleData& role_data);
 	void setRoleData(const LLUUID& role_id, LLRoleData role_data);
 	void createRole(const LLUUID& role_id, LLRoleData role_data);
 	void deleteRole(const LLUUID& role_id);
-	BOOL pendingRoleChanges();
+	bool pendingRoleChanges();
 
 	void addRolePower(const LLUUID& role_id, U64 power);
 	void removeRolePower(const LLUUID& role_id, U64 power);
@@ -297,15 +297,15 @@ public:
 	LLUUID				mOwnerRole;
 	std::string			mName;
 	std::string			mCharter;
-	BOOL				mShowInList;
+	bool				mShowInList;
 	LLUUID				mInsigniaID;
 	LLUUID				mFounderID;
-	BOOL				mOpenEnrollment;
+	bool				mOpenEnrollment;
 	S32					mMembershipFee;
-	BOOL				mAllowPublish;
-	BOOL				mListInProfile;
-	BOOL				mMaturePublish;
-	BOOL				mChanged;
+	bool				mAllowPublish;
+	bool				mListInProfile;
+	bool				mMaturePublish;
+	bool				mChanged;
 	S32					mMemberCount;
 	S32					mRoleCount;
 
@@ -398,9 +398,9 @@ public:
 									   U8 show_in_list,
 									   const LLUUID& insignia,
 									   S32 membership_fee,
-									   BOOL open_enrollment,
-									   BOOL allow_publish,
-									   BOOL mature_publish);
+									   bool open_enrollment,
+									   bool allow_publish,
+									   bool mature_publish);
 
 	static void sendGroupMemberJoin(const LLUUID& group_id);
 	static void sendGroupMemberInvites(const LLUUID& group_id, std::map<LLUUID,LLUUID>& role_member_pairs);