Merge branch 'DRTVWR-600-maint-A' into signal/trim-trailing

1 files changed, 6 insertions, 6 deletions

diff --git a/indra/newview/llsurface.h b/indra/newview/llsurface.h
index ca86e2334e..d759389585 100644
--- a/indra/newview/llsurface.h
+++ b/indra/newview/llsurface.h
@@ -84,7 +84,7 @@ public:
     void disconnectNeighbor(LLSurface *neighborp);
     void disconnectAllNeighbors();
 
-    virtual void decompressDCTPatch(LLBitPack &bitpack, LLGroupHeader *gopp, BOOL b_large_patch);
+    virtual void decompressDCTPatch(LLBitPack &bitpack, LLGroupHeader *gopp, bool b_large_patch);
     virtual void updatePatchVisibilities(LLAgent &agent);
 
     inline F32 getZ(const U32 k) const              { return mSurfaceZ[k]; }
@@ -112,9 +112,9 @@ public:
     LLSurfacePatch *resolvePatchGlobal(const LLVector3d &position_global) const;
 
     // Update methods (called during idle, normally)
-    BOOL idleUpdate(F32 max_update_time);
+    bool idleUpdate(F32 max_update_time);
 
-    BOOL containsPosition(const LLVector3 &position);
+    bool containsPosition(const LLVector3 &position);
 
     void moveZ(const S32 x, const S32 y, const F32 delta);
 
@@ -128,7 +128,7 @@ public:
 
     LLViewerTexture *getSTexture();
     LLViewerTexture *getWaterTexture();
-    BOOL hasZData() const                           { return mHasZData; }
+    bool hasZData() const                           { return mHasZData; }
 
     void dirtyAllPatches(); // Use this to dirty all patches when changing terrain parameters
 
@@ -178,7 +178,7 @@ protected:
     void createPatchData();     // Allocates memory for patches.
     void destroyPatchData();    // Deallocates memory for patches.
 
-    BOOL generateWaterTexture(const F32 x, const F32 y,
+    bool generateWaterTexture(const F32 x, const F32 y,
                         const F32 width, const F32 height);     // Generate texture from composition values.
 
     //F32 updateTexture(LLSurfacePatch *ppatch);
@@ -213,7 +213,7 @@ protected:
 
     LLPatchVertexArray mPVArray;
 
-    BOOL        mHasZData;              // We've received any patch data for this surface.
+    bool        mHasZData;              // We've received any patch data for this surface.
     F32         mMinZ;                  // min z for this region (during the session)
     F32         mMaxZ;                  // max z for this region (during the session)