Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge

1 files changed, 8 insertions, 8 deletions

diff --git a/indra/newview/llpanelgroup.h b/indra/newview/llpanelgroup.h
index be40b08a6d..5aeadaefdb 100644
--- a/indra/newview/llpanelgroup.h
+++ b/indra/newview/llpanelgroup.h
@@ -49,7 +49,7 @@ public:
 	LLPanelGroup();
 	virtual ~LLPanelGroup();
 
-	virtual BOOL postBuild();
+	virtual bool postBuild();
 
 	void setGroupID(const LLUUID& group_id);
 
@@ -77,7 +77,7 @@ public:
 	void callGroup();
 	void chatGroup();
 
-	virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
+	virtual void reshape(S32 width, S32 height, bool called_from_parent = true);
 
 	static void showNotice(const std::string& subject,
 						   const std::string& message,
@@ -107,7 +107,7 @@ protected:
 
 	LLTimer mRefreshTimer;
 
-	BOOL mSkipRefresh;
+	bool mSkipRefresh;
 
 	std::string mDefaultNeedsApplyMesg;
 	std::string mWantApplyMesg;
@@ -135,7 +135,7 @@ public:
 	virtual bool needsApply(std::string& mesg) { return false; }
 
 	// Asks if there is currently a modal dialog being shown.
-	virtual BOOL hasModal() { return mHasModal; }
+	virtual bool hasModal() { return mHasModal; }
 
 	// Request to apply current data.
 	// If returning fail, this function should modify the message to the user.
@@ -148,9 +148,9 @@ public:
 	virtual void update(LLGroupChange gc) { }
 
 	// This just connects the help button callback.
-	virtual BOOL postBuild();
+	virtual bool postBuild();
 
-	virtual BOOL isVisibleByAgent(LLAgent* agentp);
+	virtual bool isVisibleByAgent(LLAgent* agentp);
 
 	virtual void setGroupID(const LLUUID& id) {mGroupID = id;};
 
@@ -164,8 +164,8 @@ public:
 
 protected:
 	LLUUID	mGroupID;
-	BOOL mAllowEdit;
-	BOOL mHasModal;
+	bool mAllowEdit;
+	bool mHasModal;
 };
 
 #endif // LL_LLPANELGROUP_H