Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 15 insertions, 15 deletions

diff --git a/indra/newview/llfloaternamedesc.cpp b/indra/newview/llfloaternamedesc.cpp
index b47deb838b..01c50d89c5 100644
--- a/indra/newview/llfloaternamedesc.cpp
+++ b/indra/newview/llfloaternamedesc.cpp
@@ -64,7 +64,7 @@ const S32 PREVIEW_HPAD = PREVIEW_RESIZE_HANDLE_SIZE;
 //-----------------------------------------------------------------------------
 LLFloaterNameDesc::LLFloaterNameDesc(const LLSD& filename )
     : LLFloater(filename),
-      mIsAudio(FALSE)
+      mIsAudio(false)
 {
     mFilenameAndPath = filename.asString();
     mFilename = gDirUtilp->getBaseFileName(mFilenameAndPath, false);
@@ -73,7 +73,7 @@ LLFloaterNameDesc::LLFloaterNameDesc(const LLSD& filename )
 //-----------------------------------------------------------------------------
 // postBuild()
 //-----------------------------------------------------------------------------
-BOOL LLFloaterNameDesc::postBuild()
+bool LLFloaterNameDesc::postBuild()
 {
     LLRect r;
 
@@ -135,7 +135,7 @@ BOOL LLFloaterNameDesc::postBuild()
 
     setDefaultBtn("ok_btn");
 
-    return TRUE;
+    return true;
 }
 
 S32 LLFloaterNameDesc::getExpectedUploadCost() const
@@ -186,7 +186,7 @@ void LLFloaterNameDesc::doCommit()
 //-----------------------------------------------------------------------------
 void LLFloaterNameDesc::onBtnOK( )
 {
-    getChildView("ok_btn")->setEnabled(FALSE); // don't allow inadvertent extra uploads
+    getChildView("ok_btn")->setEnabled(false); // don't allow inadvertent extra uploads
 
     LLAssetStorage::LLStoreAssetCallback callback;
     S32 expected_upload_cost = getExpectedUploadCost();
@@ -233,17 +233,17 @@ void LLFloaterNameDesc::onBtnCancel()
 LLFloaterSoundPreview::LLFloaterSoundPreview(const LLSD& filename )
     : LLFloaterNameDesc(filename)
 {
-    mIsAudio = TRUE;
+    mIsAudio = true;
 }
 
-BOOL LLFloaterSoundPreview::postBuild()
+bool LLFloaterSoundPreview::postBuild()
 {
     if (!LLFloaterNameDesc::postBuild())
     {
-        return FALSE;
+        return false;
     }
     getChild<LLUICtrl>("ok_btn")->setCommitCallback(boost::bind(&LLFloaterNameDesc::onBtnOK, this));
-    return TRUE;
+    return true;
 }
 
 
@@ -256,14 +256,14 @@ LLFloaterAnimPreview::LLFloaterAnimPreview(const LLSD& filename )
 {
 }
 
-BOOL LLFloaterAnimPreview::postBuild()
+bool LLFloaterAnimPreview::postBuild()
 {
     if (!LLFloaterNameDesc::postBuild())
     {
-        return FALSE;
+        return false;
     }
     getChild<LLUICtrl>("ok_btn")->setCommitCallback(boost::bind(&LLFloaterNameDesc::onBtnOK, this));
-    return TRUE;
+    return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -273,15 +273,15 @@ BOOL LLFloaterAnimPreview::postBuild()
 LLFloaterScriptPreview::LLFloaterScriptPreview(const LLSD& filename )
     : LLFloaterNameDesc(filename)
 {
-    mIsText = TRUE;
+    mIsText = true;
 }
 
-BOOL LLFloaterScriptPreview::postBuild()
+bool LLFloaterScriptPreview::postBuild()
 {
     if (!LLFloaterNameDesc::postBuild())
     {
-        return FALSE;
+        return false;
     }
     getChild<LLUICtrl>("ok_btn")->setCommitCallback(boost::bind(&LLFloaterNameDesc::onBtnOK, this));
-    return TRUE;
+    return true;
 }