Merge pull request #2450 from secondlife/lua-merge

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

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llhudicon.h b/indra/newview/llhudicon.h
index edc843aa8c..b18a4a3b76 100644
--- a/indra/newview/llhudicon.h
+++ b/indra/newview/llhudicon.h
@@ -62,12 +62,12 @@ public:
     static void cleanupDeadIcons();
     static S32 getNumInstances();
 
-    static BOOL iconsNearby();
+    static bool iconsNearby();
 
-    BOOL getHidden() const { return mHidden; }
-    void setHidden( BOOL hide ) { mHidden = hide; }
+    bool getHidden() const { return mHidden; }
+    void setHidden( bool hide ) { mHidden = hide; }
 
-    BOOL lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end, LLVector4a* intersection);
+    bool lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end, LLVector4a* intersection);
 
 protected:
     LLHUDIcon(const U8 type);
@@ -79,7 +79,7 @@ private:
     LLFrameTimer    mLifeTimer;
     F32             mDistance;
     F32             mScale;
-    BOOL            mHidden;
+    bool            mHidden;
 
     typedef std::vector<LLPointer<LLHUDIcon> > icon_instance_t;
     static icon_instance_t sIconInstances;