Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 13 insertions, 13 deletions

diff --git a/indra/newview/llvieweroctree.h b/indra/newview/llvieweroctree.h
index 2a072056df..60e17a6f58 100644
--- a/indra/newview/llvieweroctree.h
+++ b/indra/newview/llvieweroctree.h
@@ -213,11 +213,11 @@ public:
     virtual void unbound();
     virtual void rebound();
 
-    BOOL isDead()                           { return hasState(DEAD); }
+    bool isDead()                           { return hasState(DEAD); }
 
     void setVisible();
-    BOOL isVisible() const;
-    virtual BOOL isRecentlyVisible() const;
+    bool isVisible() const;
+    virtual bool isRecentlyVisible() const;
     S32  getVisible(LLViewerCamera::eCameraID id) const {return mVisible[id];}
     S32  getAnyVisible() const {return mAnyVisible;}
     bool isEmpty() const { return mOctreeNode->isEmpty(); }
@@ -253,7 +253,7 @@ public:
 protected:
     void checkStates();
 private:
-    virtual bool boundObjects(BOOL empty, LLVector4a& minOut, LLVector4a& maxOut);
+    virtual bool boundObjects(bool empty, LLVector4a& minOut, LLVector4a& maxOut);
 
 protected:
     U32         mState;
@@ -305,19 +305,19 @@ public:
     void clearOcclusionState(U32 state, S32 mode = STATE_MODE_SINGLE);
     void checkOcclusion(); //read back last occlusion query (if any)
     void doOcclusion(LLCamera* camera, const LLVector4a* shift = NULL); //issue occlusion query
-    BOOL isOcclusionState(U32 state) const  { return mOcclusionState[LLViewerCamera::sCurCameraID] & state ? TRUE : FALSE; }
-    U32  getOcclusionState() const  { return mOcclusionState[LLViewerCamera::sCurCameraID];}
+    bool isOcclusionState(U32 state) const { return mOcclusionState[LLViewerCamera::sCurCameraID] & state; }
+    U32  getOcclusionState() const { return mOcclusionState[LLViewerCamera::sCurCameraID];}
 
-    BOOL needsUpdate();
+    bool needsUpdate();
     U32  getLastOcclusionIssuedTime();
 
     //virtual
     void handleChildAddition(const OctreeNode* parent, OctreeNode* child);
 
     //virtual
-    BOOL isRecentlyVisible() const;
+    bool isRecentlyVisible() const;
     LLViewerOctreePartition* getSpatialPartition()const {return mSpatialPartition;}
-    BOOL isAnyRecentlyVisible() const;
+    bool isAnyRecentlyVisible() const;
 
     static U32 getNewOcclusionQueryObjectName();
     static void releaseOcclusionQueryObjectName(U32 name);
@@ -326,7 +326,7 @@ protected:
     void releaseOcclusionQueryObjectNames();
 
 private:
-    BOOL earlyFail(LLCamera* camera, const LLVector4a* bounds);
+    bool earlyFail(LLCamera* camera, const LLVector4a* bounds);
 
 protected:
     U32         mOcclusionState[LLViewerCamera::NUM_CAMERAS];
@@ -350,7 +350,7 @@ public:
 
     // Cull on arbitrary frustum
     virtual S32 cull(LLCamera &camera, bool do_occlusion) = 0;
-    BOOL isOcclusionEnabled();
+    bool isOcclusionEnabled();
 
 protected:
     // MUST call from destructor of any derived classes (SL-17276)
@@ -361,7 +361,7 @@ public:
     U32              mDrawableType;
     OctreeNode*      mOctree;
     LLViewerRegion*  mRegionp; // the region this partition belongs to.
-    BOOL             mOcclusionEnabled; // if TRUE, occlusion culling is performed
+    bool             mOcclusionEnabled; // if true, occlusion culling is performed
     U32              mLODSeed;
     U32              mLODPeriod;    //number of frames between LOD updates for a given spatial group (staggered by mLODSeed)
 };
@@ -419,7 +419,7 @@ public:
     virtual void visit(const OctreeNode* branch);
 
 public:
-    static BOOL sInDebug;
+    static bool sInDebug;
 };
 
 #endif