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

1 files changed, 12 insertions, 12 deletions

diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
index ab255d5215..c8cb18d171 100644
--- a/indra/newview/llpanelgroup.cpp
+++ b/indra/newview/llpanelgroup.cpp
@@ -62,8 +62,8 @@ static LLPanelInjector<LLPanelGroup> t_panel_group("panel_group_info_sidetray");
 
 LLPanelGroupTab::LLPanelGroupTab()
 	: LLPanel(),
-	  mAllowEdit(TRUE),
-	  mHasModal(FALSE)
+	  mAllowEdit(true),
+	  mHasModal(false)
 {
 	mGroupID = LLUUID::null;
 }
@@ -72,21 +72,21 @@ LLPanelGroupTab::~LLPanelGroupTab()
 {
 }
 
-BOOL LLPanelGroupTab::isVisibleByAgent(LLAgent* agentp)
+bool LLPanelGroupTab::isVisibleByAgent(LLAgent* agentp)
 {
 	//default to being visible
-	return TRUE;
+	return true;
 }
 
-BOOL LLPanelGroupTab::postBuild()
+bool LLPanelGroupTab::postBuild()
 {
-	return TRUE;
+	return true;
 }
 
 LLPanelGroup::LLPanelGroup()
 :	LLPanel(),
 	LLGroupMgrObserver( LLUUID() ),
-	mSkipRefresh(FALSE),
+	mSkipRefresh(false),
 	mButtonJoin(NULL)
 {
 	// Set up the factory callbacks.
@@ -137,7 +137,7 @@ void LLPanelGroup::onOpen(const LLSD& key)
 
 }
 
-BOOL LLPanelGroup::postBuild()
+bool LLPanelGroup::postBuild()
 {
 	mDefaultNeedsApplyMesg = getString("default_needs_apply_text");
 	mWantApplyMesg = getString("want_apply_text");
@@ -187,7 +187,7 @@ BOOL LLPanelGroup::postBuild()
 
 	LLVoiceClient::getInstance()->addObserver(this);
 	
-	return TRUE;
+	return true;
 }
 
 void LLPanelGroup::reposButton(const std::string& name)
@@ -221,7 +221,7 @@ void LLPanelGroup::reposButtons()
 	reposButton("btn_call");
 }
 
-void LLPanelGroup::reshape(S32 width, S32 height, BOOL called_from_parent )
+void LLPanelGroup::reshape(S32 width, S32 height, bool called_from_parent )
 {
 	LLPanel::reshape(width, height, called_from_parent );
 
@@ -485,7 +485,7 @@ bool LLPanelGroup::apply(LLPanelGroupTab* tab)
 			}
 		}
 
-		mSkipRefresh = TRUE;
+		mSkipRefresh = true;
 		return true;
 	}
 		
@@ -538,7 +538,7 @@ void LLPanelGroup::refreshData()
 {
 	if(mSkipRefresh)
 	{
-		mSkipRefresh = FALSE;
+		mSkipRefresh = false;
 		return;
 	}
 	LLGroupMgr::getInstance()->clearGroupData(getID());