Merge branch 'release/luau-scripting' into lua-resultset

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/llui/llstyle.h b/indra/llui/llstyle.h
index 2a60bd265e..7dbccfff87 100644
--- a/indra/llui/llstyle.h
+++ b/indra/llui/llstyle.h
@@ -61,8 +61,8 @@ public:
     const LLUIColor& getSelectedColor() const { return mSelectedColor; }
     void setSelectedColor(const LLUIColor& color) { mSelectedColor = color; }
 
-    BOOL isVisible() const;
-    void setVisible(BOOL is_visible);
+    bool isVisible() const;
+    void setVisible(bool is_visible);
 
     LLFontGL::ShadowType getShadowType() const { return mDropShadow; }
 
@@ -71,13 +71,13 @@ public:
 
     const std::string& getLinkHREF() const { return mLink; }
     void setLinkHREF(const std::string& href);
-    BOOL isLink() const;
+    bool isLink() const;
 
     LLPointer<LLUIImage> getImage() const;
     void setImage(const LLUUID& src);
     void setImage(const std::string& name);
 
-    BOOL isImage() const { return mImagep.notNull(); }
+    bool isImage() const { return mImagep.notNull(); }
 
     bool operator==(const LLStyle &rhs) const
     {
@@ -101,7 +101,7 @@ protected:
     ~LLStyle() { }
 
 private:
-    BOOL                mVisible;
+    bool                mVisible;
     LLUIColor           mColor;
     LLUIColor           mReadOnlyColor;
     LLUIColor           mSelectedColor;