Merge branch 'develop' into nat/edu-channel

1 files changed, 10 insertions, 10 deletions

diff --git a/indra/newview/llvocache.h b/indra/newview/llvocache.h
index b2578085d8..9679a20ae0 100644
--- a/indra/newview/llvocache.h
+++ b/indra/newview/llvocache.h
@@ -140,14 +140,14 @@ public:
     void removeChild(LLVOCacheEntry* entry);
     void removeAllChildren();
     LLVOCacheEntry* getChild(); //remove the first child, and return it.
-    S32  getNumOfChildren() const  {return mChildrenList.size();}
+    S32  getNumOfChildren() const { return static_cast<S32>(mChildrenList.size()); }
 
     void setBoundingInfo(const LLVector3& pos, const LLVector3& scale); //called from processing object update message
     void updateParentBoundingInfo();
     void saveBoundingSphere();
 
-    void setValid(BOOL valid = TRUE) {mValid = valid;}
-    BOOL isValid() const {return mValid;}
+    void setValid(bool valid = true) {mValid = valid;}
+    bool isValid() const {return mValid;}
 
     void setUpdateFlags(U32 flags) {mUpdateFlags = flags;}
     U32  getUpdateFlags() const    {return mUpdateFlags;}
@@ -181,7 +181,7 @@ protected:
     U32                         mState; //high 16 bits reserved for special use.
     vocache_entry_set_t         mChildrenList; //children entries in a linked set.
 
-    BOOL                        mValid; //if set, this entry is valid, otherwise it is invalid and will be removed.
+    bool                        mValid; //if set, this entry is valid, otherwise it is invalid and will be removed.
 
     LLVector4a                  mBSphereCenter; //bounding sphere center
     F32                         mBSphereRadius; //bounding sphere radius
@@ -220,7 +220,7 @@ public:
     void processOccluders(LLCamera* camera);
     void removeOccluder(LLVOCacheGroup* group);
 
-    void setCullHistory(BOOL has_new_object);
+    void setCullHistory(bool has_new_object);
 
     bool isFrontCull() const {return mFrontCull;}
 
@@ -228,10 +228,10 @@ private:
     void selectBackObjects(LLCamera &camera, F32 projection_area_cutoff, bool use_occlusion); //select objects behind camera.
 
 public:
-    static BOOL sNeedsOcclusionCheck;
+    static bool sNeedsOcclusionCheck;
 
 private:
-    BOOL  mFrontCull; //the view frustum cull if set, otherwise is back sphere cull.
+    bool  mFrontCull; //the view frustum cull if set, otherwise is back sphere cull.
     U32   mCullHistory;
     U32   mCulledTime[LLViewerCamera::NUM_CAMERAS];
     std::set<LLVOCacheGroup*> mOccludedGroups;
@@ -288,8 +288,8 @@ public:
     bool readFromCache(U64 handle, const LLUUID& id, LLVOCacheEntry::vocache_entry_map_t& cache_entry_map) ;
     void readGenericExtrasFromCache(U64 handle, const LLUUID& id, LLVOCacheEntry::vocache_gltf_overrides_map_t& cache_extras_entry_map, const LLVOCacheEntry::vocache_entry_map_t& cache_entry_map);
 
-    void writeToCache(U64 handle, const LLUUID& id, const LLVOCacheEntry::vocache_entry_map_t& cache_entry_map, BOOL dirty_cache, bool removal_enabled);
-    void writeGenericExtrasToCache(U64 handle, const LLUUID& id, const LLVOCacheEntry::vocache_gltf_overrides_map_t& cache_extras_entry_map, BOOL dirty_cache, bool removal_enabled);
+    void writeToCache(U64 handle, const LLUUID& id, const LLVOCacheEntry::vocache_entry_map_t& cache_entry_map, bool dirty_cache, bool removal_enabled);
+    void writeGenericExtrasToCache(U64 handle, const LLUUID& id, const LLVOCacheEntry::vocache_gltf_overrides_map_t& cache_extras_entry_map, bool dirty_cache, bool removal_enabled);
     void removeEntry(U64 handle) ;
     void removeGenericExtrasForHandle(U64 handle);
 
@@ -308,7 +308,7 @@ private:
     void removeCache() ;
     void removeEntry(HeaderEntryInfo* entry) ;
     void purgeEntries(U32 size);
-    BOOL updateEntry(const HeaderEntryInfo* entry);
+    bool updateEntry(const HeaderEntryInfo* entry);
 
 private:
     bool                 mEnabled;