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

1 files changed, 11 insertions, 11 deletions

diff --git a/indra/newview/lltoolmorph.h b/indra/newview/lltoolmorph.h
index 5bfb4e694f..fb62ba9bba 100644
--- a/indra/newview/lltoolmorph.h
+++ b/indra/newview/lltoolmorph.h
@@ -63,18 +63,18 @@ public:
 
     /*virtual*/ S8 getType() const ;
 
-    BOOL                    needsRender();
-    void                    preRender(BOOL clear_depth);
-    BOOL                    render();
-    void                    requestUpdate( S32 delay_frames ) {mNeedsUpdate = TRUE; mDelayFrames = delay_frames; }
+    bool                    needsRender();
+    void                    preRender(bool clear_depth);
+    bool                    render();
+    void                    requestUpdate( S32 delay_frames ) {mNeedsUpdate = true; mDelayFrames = delay_frames; }
     void                    setUpdateDelayFrames( S32 delay_frames ) { mDelayFrames = delay_frames; }
     void                    draw(F32 alpha);
 
     LLViewerVisualParam*    getVisualParam() { return mVisualParam; }
     F32                     getVisualParamWeight() { return mVisualParamWeight; }
-    BOOL                    getVisible() { return mIsVisible; }
+    bool                    getVisible() { return mIsVisible; }
 
-    void                    setAllowsUpdates( BOOL b ) { mAllowsUpdates = b; }
+    void                    setAllowsUpdates( bool b ) { mAllowsUpdates = b; }
 
     const LLRect&           getRect()   { return mRect; }
 
@@ -82,13 +82,13 @@ public:
     static void             requestHintUpdates( LLVisualParamHint* exception1 = NULL, LLVisualParamHint* exception2 = NULL );
 
 protected:
-    BOOL                    mNeedsUpdate;       // does this texture need to be re-rendered?
-    BOOL                    mIsVisible;         // is this distortion hint visible?
+    bool                    mNeedsUpdate;       // does this texture need to be re-rendered?
+    bool                    mIsVisible;         // is this distortion hint visible?
     LLViewerJointMesh*      mJointMesh;         // mesh that this distortion applies to
     LLViewerVisualParam*    mVisualParam;       // visual param applied by this hint
     LLWearable*             mWearablePtr;       // wearable we're editing
     F32                     mVisualParamWeight;     // weight for this visual parameter
-    BOOL                    mAllowsUpdates;     // updates are blocked unless this is true
+    bool                    mAllowsUpdates;     // updates are blocked unless this is true
     S32                     mDelayFrames;       // updates are blocked for this many frames
     LLRect                  mRect;
     F32                     mLastParamWeight;
@@ -107,10 +107,10 @@ protected:
     /*virtual */ ~LLVisualParamReset(){}
 public:
     LLVisualParamReset();
-    /*virtual */ BOOL render();
+    /*virtual */ bool render();
     /*virtual*/ S8 getType() const ;
 
-    static BOOL sDirty;
+    static bool sDirty;
 };
 
 #endif