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

1 files changed, 12 insertions, 12 deletions

diff --git a/indra/newview/lltoolfocus.h b/indra/newview/lltoolfocus.h
index 29a548d635..c2460e7aa4 100644
--- a/indra/newview/lltoolfocus.h
+++ b/indra/newview/lltoolfocus.h
@@ -38,9 +38,9 @@ class LLToolCamera
     virtual ~LLToolCamera();
 public:
 
-    virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask) override;
-    virtual BOOL    handleMouseUp(S32 x, S32 y, MASK mask) override;
-    virtual BOOL    handleHover(S32 x, S32 y, MASK mask) override;
+    virtual bool    handleMouseDown(S32 x, S32 y, MASK mask) override;
+    virtual bool    handleMouseUp(S32 x, S32 y, MASK mask) override;
+    virtual bool    handleHover(S32 x, S32 y, MASK mask) override;
 
     virtual void    onMouseCaptureLost() override;
 
@@ -51,7 +51,7 @@ public:
 
     void setClickPickPending() { mClickPickPending = true; }
     static void pickCallback(const LLPickInfo& pick_info);
-    BOOL mouseSteerMode() { return mMouseSteering; }
+    bool mouseSteerMode() { return mMouseSteering; }
 
 protected:
     // called from handleMouseUp and onMouseCaptureLost to "let go"
@@ -63,20 +63,20 @@ protected:
     S32     mAccumY;
     S32     mMouseDownX;
     S32     mMouseDownY;
-    BOOL    mOutsideSlopX;
-    BOOL    mOutsideSlopY;
-    BOOL    mValidClickPoint;
+    bool    mOutsideSlopX;
+    bool    mOutsideSlopY;
+    bool    mValidClickPoint;
     bool    mClickPickPending;
-    BOOL    mValidSelection;
-    BOOL    mMouseSteering;
+    bool    mValidSelection;
+    bool    mMouseSteering;
     S32     mMouseUpX;  // needed for releaseMouse()
     S32     mMouseUpY;
     MASK    mMouseUpMask;
 };
 
 
-extern BOOL gCameraBtnOrbit;
-extern BOOL gCameraBtnPan;
-extern BOOL gCameraBtnZoom;
+extern bool gCameraBtnOrbit;
+extern bool gCameraBtnPan;
+extern bool gCameraBtnZoom;
 
 #endif