Merge pull request #2450 from secondlife/lua-merge

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

1 files changed, 7 insertions, 7 deletions

diff --git a/indra/llappearance/llviewervisualparam.h b/indra/llappearance/llviewervisualparam.h
index 7e332875f5..b79983df8e 100644
--- a/indra/llappearance/llviewervisualparam.h
+++ b/indra/llappearance/llviewervisualparam.h
@@ -43,19 +43,19 @@ public:
     LLViewerVisualParamInfo();
     /*virtual*/ ~LLViewerVisualParamInfo();
 
-    /*virtual*/ BOOL parseXml(LLXmlTreeNode* node);
+    /*virtual*/ bool parseXml(LLXmlTreeNode* node);
 
     /*virtual*/ void toStream(std::ostream &out);
 
 protected:
     S32         mWearableType;
-    BOOL        mCrossWearable;
+    bool        mCrossWearable;
     std::string mEditGroup;
     F32         mCamDist;
     F32         mCamAngle;      // degrees
     F32         mCamElevation;
     F32         mEditGroupDisplayOrder;
-    BOOL        mShowSimple;    // show edit controls when in "simple ui" mode?
+    bool        mShowSimple;    // show edit controls when in "simple ui" mode?
     F32         mSimpleMin;     // when in simple UI, apply this minimum, range 0.f to 100.f
     F32         mSimpleMax;     // when in simple UI, apply this maximum, range 0.f to 100.f
 };
@@ -75,12 +75,12 @@ public:
     // Special: These functions are overridden by child classes
     LLViewerVisualParamInfo     *getInfo() const { return (LLViewerVisualParamInfo*)mInfo; };
     //   This sets mInfo and calls initialization functions
-    BOOL                        setInfo(LLViewerVisualParamInfo *info);
+    bool                        setInfo(LLViewerVisualParamInfo *info);
 
     virtual LLViewerVisualParam* cloneParam(LLWearable* wearable) const = 0;
 
     // LLVisualParam Virtual functions
-    ///*virtual*/ BOOL          parseData(LLXmlTreeNode* node);
+    ///*virtual*/ bool          parseData(LLXmlTreeNode* node);
 
     // New Virtual functions
     virtual F32                 getTotalDistortion() = 0;
@@ -99,11 +99,11 @@ public:
     F32                 getCameraAngle() const      { return getInfo()->mCamAngle; }  // degrees
     F32                 getCameraElevation() const  { return getInfo()->mCamElevation; }
 
-    BOOL                getShowSimple() const       { return getInfo()->mShowSimple; }
+    bool                getShowSimple() const       { return getInfo()->mShowSimple; }
     F32                 getSimpleMin() const        { return getInfo()->mSimpleMin; }
     F32                 getSimpleMax() const        { return getInfo()->mSimpleMax; }
 
-    BOOL                getCrossWearable() const    { return getInfo()->mCrossWearable; }
+    bool                getCrossWearable() const    { return getInfo()->mCrossWearable; }
 
 protected:
     LLViewerVisualParam(const LLViewerVisualParam& pOther);