Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/newview/llinspect.cpp b/indra/newview/llinspect.cpp
index 101b9bdc2d..bfef4860c4 100644
--- a/indra/newview/llinspect.cpp
+++ b/indra/newview/llinspect.cpp
@@ -93,15 +93,15 @@ void LLInspect::onFocusLost()
 }
 
 // virtual
-BOOL LLInspect::handleHover(S32 x, S32 y, MASK mask)
+bool LLInspect::handleHover(S32 x, S32 y, MASK mask)
 {
     mOpenTimer.pause();
     return LLView::handleHover(x, y, mask);
 }
 
-BOOL LLInspect::handleToolTip(S32 x, S32 y, MASK mask)
+bool LLInspect::handleToolTip(S32 x, S32 y, MASK mask)
 {
-    BOOL handled = FALSE;
+    bool handled = false;
 
 
     //delegate handling of tooltip to the hovered child
@@ -115,7 +115,7 @@ BOOL LLInspect::handleToolTip(S32 x, S32 y, MASK mask)
         //set up delay if there is no visible tooltip at this moment
         params.delay_time =  LLToolTipMgr::instance().toolTipVisible() ? 0.f : LLUI::getInstance()->mSettingGroups["config"]->getF32( "ToolTipDelay" );
         LLToolTipMgr::instance().show(params);
-        handled = TRUE;
+        handled = true;
     }
     return handled;
 }