Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llfloatervoicevolume.cpp b/indra/newview/llfloatervoicevolume.cpp
index ec1a09f877..17783ee810 100644
--- a/indra/newview/llfloatervoicevolume.cpp
+++ b/indra/newview/llfloatervoicevolume.cpp
@@ -60,7 +60,7 @@ public:
     LLFloaterVoiceVolume(const LLSD& avatar_id);
     virtual ~LLFloaterVoiceVolume();
 
-    /*virtual*/ BOOL postBuild(void);
+    /*virtual*/ bool postBuild(void);
 
     // Because floater is single instance, need to re-parse data on each spawn
     // (for example, inspector about same avatar but in different position)
@@ -104,7 +104,7 @@ LLFloaterVoiceVolume::~LLFloaterVoiceVolume()
 }
 
 /*virtual*/
-BOOL LLFloaterVoiceVolume::postBuild(void)
+bool LLFloaterVoiceVolume::postBuild(void)
 {
     getChild<LLUICtrl>("mute_btn")->setCommitCallback(
         boost::bind(&LLFloaterVoiceVolume::onClickMuteVolume, this) );
@@ -112,7 +112,7 @@ BOOL LLFloaterVoiceVolume::postBuild(void)
     getChild<LLUICtrl>("volume_slider")->setCommitCallback(
         boost::bind(&LLFloaterVoiceVolume::onVolumeChange, this, _2));
 
-    return TRUE;
+    return true;
 }