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

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/newview/llfloatergridstatus.cpp b/indra/newview/llfloatergridstatus.cpp
index 9745e17bbb..eb3d23d785 100644
--- a/indra/newview/llfloatergridstatus.cpp
+++ b/indra/newview/llfloatergridstatus.cpp
@@ -43,16 +43,16 @@ const std::string DEFAULT_GRID_STATUS_URL = "http://status.secondlifegrid.net/";
 
 LLFloaterGridStatus::LLFloaterGridStatus(const Params& key) :
     LLFloaterWebContent(key),
-    mIsFirstUpdate(TRUE)
+    mIsFirstUpdate(true)
 {
 }
 
-BOOL LLFloaterGridStatus::postBuild()
+bool LLFloaterGridStatus::postBuild()
 {
     LLFloaterWebContent::postBuild();
     mWebBrowser->addObserver(this);
 
-    return TRUE;
+    return true;
 }
 
 void LLFloaterGridStatus::onOpen(const LLSD& key)
@@ -154,7 +154,7 @@ void LLFloaterGridStatus::getGridStatusRSSCoro()
     {
         gToolBarView->flashCommand(LLCommandId("gridstatus"), true);
     }
-    getInstance()->setFirstUpdate(FALSE);
+    getInstance()->setFirstUpdate(false);
 }
 
 // virtual