Merge branch 'DRTVWR-600-maint-A' into signal/trim-trailing

1 files changed, 19 insertions, 19 deletions

diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h
index 94f87d5b0f..b3884a6bfc 100644
--- a/indra/newview/lltoolpie.h
+++ b/indra/newview/lltoolpie.h
@@ -42,17 +42,17 @@ class LLToolPie : public LLTool, public LLSingleton<LLToolPie>
 public:
 
     // Virtual functions inherited from LLMouseHandler
-    virtual BOOL        handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, BOOL down) override;
-    virtual BOOL        handleMouseDown(S32 x, S32 y, MASK mask) override;
-    virtual BOOL        handleRightMouseDown(S32 x, S32 y, MASK mask) override;
-    virtual BOOL        handleMouseUp(S32 x, S32 y, MASK mask) override;
-    virtual BOOL        handleRightMouseUp(S32 x, S32 y, MASK mask) override;
-    virtual BOOL        handleHover(S32 x, S32 y, MASK mask) override;
-    virtual BOOL        handleDoubleClick(S32 x, S32 y, MASK mask) override;
-    BOOL                handleScrollWheelAny(S32 x, S32 y, S32 clicks_x, S32 clicks_y);
-    virtual BOOL        handleScrollWheel(S32 x, S32 y, S32 clicks) override;
-    virtual BOOL        handleScrollHWheel(S32 x, S32 y, S32 clicks) override;
-    virtual BOOL        handleToolTip(S32 x, S32 y, MASK mask) override;
+    virtual bool        handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, bool down) override;
+    virtual bool        handleMouseDown(S32 x, S32 y, MASK mask) override;
+    virtual bool        handleRightMouseDown(S32 x, S32 y, MASK mask) override;
+    virtual bool        handleMouseUp(S32 x, S32 y, MASK mask) override;
+    virtual bool        handleRightMouseUp(S32 x, S32 y, MASK mask) override;
+    virtual bool        handleHover(S32 x, S32 y, MASK mask) override;
+    virtual bool        handleDoubleClick(S32 x, S32 y, MASK mask) override;
+    bool                handleScrollWheelAny(S32 x, S32 y, S32 clicks_x, S32 clicks_y);
+    virtual bool        handleScrollWheel(S32 x, S32 y, S32 clicks) override;
+    virtual bool        handleScrollHWheel(S32 x, S32 y, S32 clicks) override;
+    virtual bool        handleToolTip(S32 x, S32 y, MASK mask) override;
 
     virtual void        render() override;
 
@@ -81,10 +81,10 @@ public:
     static void         VisitHomePage(const LLPickInfo& info);
 
 private:
-    BOOL outsideSlop        (S32 x, S32 y, S32 start_x, S32 start_y);
-    BOOL handleLeftClickPick();
-    BOOL handleRightClickPick();
-    BOOL useClickAction     (MASK mask, LLViewerObject* object,LLViewerObject* parent);
+    bool outsideSlop        (S32 x, S32 y, S32 start_x, S32 start_y);
+    bool handleLeftClickPick();
+    bool handleRightClickPick();
+    bool useClickAction     (MASK mask, LLViewerObject* object,LLViewerObject* parent);
 
     void showVisualContextMenuEffect();
     ECursorType cursorFromObject(LLViewerObject* object);
@@ -93,8 +93,8 @@ private:
     bool handleMediaDblClick(const LLPickInfo& info);
     bool handleMediaHover(const LLPickInfo& info);
     bool handleMediaMouseUp();
-    BOOL handleTooltipLand(std::string line, std::string tooltip_msg);
-    BOOL handleTooltipObject( LLViewerObject* hover_object, std::string line, std::string tooltip_msg);
+    bool handleTooltipLand(std::string line, std::string tooltip_msg);
+    bool handleTooltipObject( LLViewerObject* hover_object, std::string line, std::string tooltip_msg);
 
     void steerCameraWithMouse(S32 x, S32 y);
     void startCameraSteering();
@@ -118,8 +118,8 @@ private:
     LLPointer<LLViewerObject> mClickActionObject;
     U8                  mClickAction;
     LLSafeHandle<LLObjectSelection> mLeftClickSelection;
-    BOOL                mClickActionBuyEnabled;
-    BOOL                mClickActionPayEnabled;
+    bool                mClickActionBuyEnabled;
+    bool                mClickActionPayEnabled;
     LLFrameTimer mDoubleClickTimer;
 };