1 files changed, 12 insertions, 12 deletions

diff --git a/indra/newview/lltexturecache.h b/indra/newview/lltexturecache.h
index 6aa3a51e18..faf722dc8f 100644
--- a/indra/newview/lltexturecache.h
+++ b/indra/newview/lltexturecache.h
@@ -87,24 +87,24 @@ public:
     class Responder : public LLResponder
     {
     public:
-        virtual void setData(U8* data, S32 datasize, S32 imagesize, S32 imageformat, BOOL imagelocal) = 0;
+        virtual void setData(U8* data, S32 datasize, S32 imagesize, S32 imageformat, bool imagelocal) = 0;
     };
 
     class ReadResponder : public Responder
     {
     public:
         ReadResponder();
-        void setData(U8* data, S32 datasize, S32 imagesize, S32 imageformat, BOOL imagelocal);
+        void setData(U8* data, S32 datasize, S32 imagesize, S32 imageformat, bool imagelocal);
         void setImage(LLImageFormatted* image) { mFormattedImage = image; }
     protected:
         LLPointer<LLImageFormatted> mFormattedImage;
         S32 mImageSize;
-        BOOL mImageLocal;
+        bool mImageLocal;
     };
 
     class WriteResponder : public Responder
     {
-        void setData(U8* data, S32 datasize, S32 imagesize, S32 imageformat, BOOL imagelocal)
+        void setData(U8* data, S32 datasize, S32 imagesize, S32 imageformat, bool imagelocal)
         {
             // not used
         }
@@ -116,8 +116,8 @@ public:
     /*virtual*/ size_t update(F32 max_time_ms);
 
     void purgeCache(ELLPath location, bool remove_dir = true);
-    void setReadOnly(BOOL read_only) ;
-    S64 initCache(ELLPath location, S64 maxsize, BOOL texture_cache_mismatch);
+    void setReadOnly(bool read_only) ;
+    S64 initCache(ELLPath location, S64 maxsize, bool texture_cache_mismatch);
 
     handle_t readFromCache(const std::string& local_filename, const LLUUID& id, S32 offset, S32 size,
                            ReadResponder* responder);
@@ -125,7 +125,7 @@ public:
     handle_t readFromCache(const LLUUID& id, S32 offset, S32 size,
                            ReadResponder* responder);
     bool readComplete(handle_t handle, bool abort);
-    handle_t writeToCache(const LLUUID& id, U8* data, S32 datasize, S32 imagesize, LLPointer<LLImageRaw> rawimage, S32 discardlevel,
+    handle_t writeToCache(const LLUUID& id, const U8* data, S32 datasize, S32 imagesize, LLPointer<LLImageRaw> rawimage, S32 discardlevel,
                           WriteResponder* responder);
     LLPointer<LLImageRaw> readFromFastCache(const LLUUID& id, S32& discardlevel);
     bool writeComplete(handle_t handle, bool abort = false);
@@ -140,14 +140,14 @@ public:
     void unlockWorkers() { mWorkersMutex.unlock(); }
 
     // debug
-    S32 getNumReads() { return mReaders.size(); }
-    S32 getNumWrites() { return mWriters.size(); }
+    S32 getNumReads() { return static_cast<S32>(mReaders.size()); }
+    S32 getNumWrites() { return static_cast<S32>(mWriters.size()); }
     S64Bytes getUsage() { return S64Bytes(mTexturesSizeTotal); }
     S64Bytes getMaxUsage() { return S64Bytes(sCacheMaxTexturesSize); }
     U32 getEntries() { return mHeaderEntriesInfo.mEntries; }
     U32 getMaxEntries() { return sCacheMaxEntries; };
-    BOOL isInCache(const LLUUID& id) ;
-    BOOL isInLocal(const LLUUID& id) ; //not thread safe at the moment
+    bool isInCache(const LLUUID& id) ;
+    bool isInLocal(const LLUUID& id) ; //not thread safe at the moment
 
 protected:
     // Accessed by LLTextureCacheWorker
@@ -214,7 +214,7 @@ private:
     typedef std::vector<std::pair<LLPointer<Responder>, bool> > responder_list_t;
     responder_list_t mCompletedList;
 
-    BOOL mReadOnly;
+    bool mReadOnly;
 
     // HEADERS (Include first mip)
     std::string mHeaderEntriesFileName;