Merge branch 'release/luau-scripting' into lua-resultset

1 files changed, 16 insertions, 16 deletions

diff --git a/indra/newview/lltoolpipette.cpp b/indra/newview/lltoolpipette.cpp
index e1b2352c76..9e3d435688 100644
--- a/indra/newview/lltoolpipette.cpp
+++ b/indra/newview/lltoolpipette.cpp
@@ -48,7 +48,7 @@
 
 LLToolPipette::LLToolPipette()
 :   LLTool(std::string("Pipette")),
-    mSuccess(TRUE)
+    mSuccess(true)
 {
 }
 
@@ -57,41 +57,41 @@ LLToolPipette::~LLToolPipette()
 { }
 
 
-BOOL LLToolPipette::handleMouseDown(S32 x, S32 y, MASK mask)
+bool LLToolPipette::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-    mSuccess = TRUE;
+    mSuccess = true;
     mTooltipMsg.clear();
-    setMouseCapture(TRUE);
+    setMouseCapture(true);
     gViewerWindow->pickAsync(x, y, mask, pickCallback);
-    return TRUE;
+    return true;
 }
 
-BOOL LLToolPipette::handleMouseUp(S32 x, S32 y, MASK mask)
+bool LLToolPipette::handleMouseUp(S32 x, S32 y, MASK mask)
 {
-    mSuccess = TRUE;
+    mSuccess = true;
     LLSelectMgr::getInstance()->unhighlightAll();
     // *NOTE: This assumes the pipette tool is a transient tool.
     LLToolMgr::getInstance()->clearTransientTool();
-    setMouseCapture(FALSE);
-    return TRUE;
+    setMouseCapture(false);
+    return true;
 }
 
-BOOL LLToolPipette::handleHover(S32 x, S32 y, MASK mask)
+bool LLToolPipette::handleHover(S32 x, S32 y, MASK mask)
 {
     gViewerWindow->setCursor(mSuccess ? UI_CURSOR_PIPETTE : UI_CURSOR_NO);
     if (hasMouseCapture()) // mouse button is down
     {
         gViewerWindow->pickAsync(x, y, mask, pickCallback);
-        return TRUE;
+        return true;
     }
-    return FALSE;
+    return false;
 }
 
-BOOL LLToolPipette::handleToolTip(S32 x, S32 y, MASK mask)
+bool LLToolPipette::handleToolTip(S32 x, S32 y, MASK mask)
 {
     if (mTooltipMsg.empty())
     {
-        return FALSE;
+        return false;
     }
 
     LLRect sticky_rect;
@@ -100,7 +100,7 @@ BOOL LLToolPipette::handleToolTip(S32 x, S32 y, MASK mask)
         .message(mTooltipMsg)
         .sticky_rect(sticky_rect));
 
-    return TRUE;
+    return true;
 }
 
 void LLToolPipette::setTextureEntry(const LLTextureEntry* entry)
@@ -129,7 +129,7 @@ void LLToolPipette::pickCallback(const LLPickInfo& pick_info)
     }
 }
 
-void LLToolPipette::setResult(BOOL success, const std::string& msg)
+void LLToolPipette::setResult(bool success, const std::string& msg)
 {
     mTooltipMsg = msg;
     mSuccess = success;