Merge branch 'main' into release/luau-scripting.

1 files changed, 22 insertions, 22 deletions

diff --git a/indra/newview/lltool.h b/indra/newview/lltool.h
index ba0a73fc72..10af156395 100644
--- a/indra/newview/lltool.h
+++ b/indra/newview/lltool.h
@@ -46,24 +46,24 @@ public:
     virtual ~LLTool();
 
     // Hack to support LLFocusMgr
-    virtual BOOL isView() const { return FALSE; }
+    virtual bool isView() const { return false; }
 
     // Virtual functions inherited from LLMouseHandler
-    virtual BOOL    handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, BOOL down);
-    virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
-    virtual BOOL    handleMouseUp(S32 x, S32 y, MASK mask);
-    virtual BOOL    handleMiddleMouseDown(S32 x, S32 y, MASK mask);
-    virtual BOOL    handleMiddleMouseUp(S32 x, S32 y, MASK mask);
-
-    virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
-    virtual BOOL    handleScrollWheel(S32 x, S32 y, S32 clicks);
-    virtual BOOL    handleScrollHWheel(S32 x, S32 y, S32 clicks);
-    virtual BOOL    handleDoubleClick(S32 x, S32 y, MASK mask);
-    virtual BOOL    handleRightMouseDown(S32 x, S32 y, MASK mask);
-    virtual BOOL    handleRightMouseUp(S32 x, S32 y, MASK mask);
-    virtual BOOL    handleToolTip(S32 x, S32 y, MASK mask);
-
-        // Return FALSE to allow context menu to be shown.
+    virtual bool    handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, bool down);
+    virtual bool    handleMouseDown(S32 x, S32 y, MASK mask);
+    virtual bool    handleMouseUp(S32 x, S32 y, MASK mask);
+    virtual bool    handleMiddleMouseDown(S32 x, S32 y, MASK mask);
+    virtual bool    handleMiddleMouseUp(S32 x, S32 y, MASK mask);
+
+    virtual bool    handleHover(S32 x, S32 y, MASK mask);
+    virtual bool    handleScrollWheel(S32 x, S32 y, S32 clicks);
+    virtual bool    handleScrollHWheel(S32 x, S32 y, S32 clicks);
+    virtual bool    handleDoubleClick(S32 x, S32 y, MASK mask);
+    virtual bool    handleRightMouseDown(S32 x, S32 y, MASK mask);
+    virtual bool    handleRightMouseUp(S32 x, S32 y, MASK mask);
+    virtual bool    handleToolTip(S32 x, S32 y, MASK mask);
+
+        // Return false to allow context menu to be shown.
     virtual void    screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const
                             { *local_x = screen_x; *local_y = screen_y; }
     virtual void    localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const
@@ -74,10 +74,10 @@ public:
     // New virtual functions
     virtual LLViewerObject* getEditingObject()      { return NULL; }
     virtual LLVector3d      getEditingPointGlobal() { return LLVector3d(); }
-    virtual BOOL            isEditing()             { return (getEditingObject() != NULL); }
+    virtual bool            isEditing()             { return (getEditingObject() != NULL); }
     virtual void            stopEditing()           {}
 
-    virtual BOOL            clipMouseWhenDown()     { return TRUE; }
+    virtual bool            clipMouseWhenDown()     { return true; }
 
     virtual void            handleSelect()          { } // do stuff when your tool is selected
     virtual void            handleDeselect()        { } // clean up when your tool is deselected
@@ -86,16 +86,16 @@ public:
 
     // isAlwaysRendered() - return true if this is a tool that should
     // always be rendered regardless of selection.
-    virtual BOOL isAlwaysRendered() { return FALSE; }
+    virtual bool isAlwaysRendered() { return false; }
 
     virtual void            render() {}             // draw tool specific 3D content in world
     virtual void            draw();                 // draw tool specific 2D overlay
 
-    virtual BOOL            handleKey(KEY key, MASK mask);
+    virtual bool            handleKey(KEY key, MASK mask);
 
     // Note: NOT virtual.  Subclasses should call this version.
-    void                    setMouseCapture(BOOL b);
-    BOOL                    hasMouseCapture();
+    void                    setMouseCapture(bool b);
+    bool                    hasMouseCapture();
     virtual void            onMouseCaptureLost() {}  // override this one as needed.
 
 protected: