Merge branch 'DRTVWR-600-maint-A' into signal/trim-trailing

1 files changed, 15 insertions, 15 deletions

diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
index 6b7680d19d..db9f1078fe 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.
@@ -146,7 +146,7 @@ void LLPanelGroup::onOpen(const LLSD& key)
 
 }
 
-BOOL LLPanelGroup::postBuild()
+bool LLPanelGroup::postBuild()
 {
     mDefaultNeedsApplyMesg = getString("default_needs_apply_text");
     mWantApplyMesg = getString("want_apply_text");
@@ -196,7 +196,7 @@ BOOL LLPanelGroup::postBuild()
 
     LLVoiceClient::getInstance()->addObserver(this);
 
-    return TRUE;
+    return true;
 }
 
 void LLPanelGroup::reposButton(const std::string& name)
@@ -230,7 +230,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 );
 
@@ -279,9 +279,9 @@ void LLPanelGroup::onBtnJoin()
     }
     else
     {
-        LL_DEBUGS() << "joining group: " << mID << LL_ENDL;
-        LLGroupActions::join(mID);
-    }
+    LL_DEBUGS() << "joining group: " << mID << LL_ENDL;
+    LLGroupActions::join(mID);
+}
 }
 
 void LLPanelGroup::changed(LLGroupChange gc)
@@ -507,7 +507,7 @@ bool LLPanelGroup::apply(LLPanelGroupTab* tab)
             }
         }
 
-        mSkipRefresh = TRUE;
+        mSkipRefresh = true;
         return true;
     }
 
@@ -560,7 +560,7 @@ void LLPanelGroup::refreshData()
 {
     if(mSkipRefresh)
     {
-        mSkipRefresh = FALSE;
+        mSkipRefresh = false;
         return;
     }
     LLGroupMgr::getInstance()->clearGroupData(getID());