Merge pull request #2450 from secondlife/lua-merge

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

1 files changed, 8 insertions, 8 deletions

diff --git a/indra/newview/llvowater.h b/indra/newview/llvowater.h
index 157a7f4891..adae86691a 100644
--- a/indra/newview/llvowater.h
+++ b/indra/newview/llvowater.h
@@ -60,7 +60,7 @@ public:
 
     /*virtual*/ void idleUpdate(LLAgent &agent, const F64 &time);
     /*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline);
-    /*virtual*/ BOOL        updateGeometry(LLDrawable *drawable);
+    /*virtual*/ bool        updateGeometry(LLDrawable *drawable);
     /*virtual*/ void        updateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax);
 
     /*virtual*/ void updateTextures();
@@ -68,16 +68,16 @@ public:
 
     virtual U32 getPartitionType() const;
 
-    /*virtual*/ BOOL isActive() const; // Whether this object needs to do an idleUpdate.
+    /*virtual*/ bool isActive() const; // Whether this object needs to do an idleUpdate.
 
-    void setUseTexture(const BOOL use_texture);
-    void setIsEdgePatch(const BOOL edge_patch);
-    BOOL getUseTexture() const { return mUseTexture; }
-    BOOL getIsEdgePatch() const { return mIsEdgePatch; }
+    void setUseTexture(const bool use_texture);
+    void setIsEdgePatch(const bool edge_patch);
+    bool getUseTexture() const { return mUseTexture; }
+    bool getIsEdgePatch() const { return mIsEdgePatch; }
 
 protected:
-    BOOL mUseTexture;
-    BOOL mIsEdgePatch;
+    bool mUseTexture;
+    bool mIsEdgePatch;
     S32  mRenderType;
 };