Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice

1 files changed, 30 insertions, 27 deletions

diff --git a/indra/newview/llviewertexturelist.h b/indra/newview/llviewertexturelist.h
index 5a38eddfd3..e4ebb7b0e8 100644
--- a/indra/newview/llviewertexturelist.h
+++ b/indra/newview/llviewertexturelist.h
@@ -38,25 +38,25 @@
 
 const U32 LL_IMAGE_REZ_LOSSLESS_CUTOFF = 128;
 
-const BOOL MIPMAP_YES = TRUE;
-const BOOL MIPMAP_NO = FALSE;
+const bool MIPMAP_YES = true;
+const bool MIPMAP_NO = false;
 
-const BOOL GL_TEXTURE_YES = TRUE;
-const BOOL GL_TEXTURE_NO = FALSE;
+const bool GL_TEXTURE_YES = true;
+const bool GL_TEXTURE_NO = false;
 
-const BOOL IMMEDIATE_YES = TRUE;
-const BOOL IMMEDIATE_NO = FALSE;
+const bool IMMEDIATE_YES = true;
+const bool IMMEDIATE_NO = false;
 
 class LLImageJ2C;
 class LLMessageSystem;
 class LLTextureView;
 
-typedef void (*LLImageCallback)(BOOL success,
+typedef void (*LLImageCallback)(bool success,
                                 LLViewerFetchedTexture *src_vi,
                                 LLImageRaw* src,
                                 LLImageRaw* src_aux,
                                 S32 discard_level,
-                                BOOL final,
+                                bool final,
                                 void* userdata);
 
 enum ETexListType
@@ -115,9 +115,9 @@ public:
     void init();
     void shutdown();
     void dump();
-    void destroyGL(BOOL save_state = TRUE);
+    void destroyGL(bool save_state = true);
     void restoreGL();
-    BOOL isInitialized() const {return mInitialized;}
+    bool isInitialized() const {return mInitialized;}
 
     void findTexturesByID(const LLUUID &image_id, std::vector<LLViewerFetchedTexture*> &output);
     LLViewerFetchedTexture *findImage(const LLUUID &image_id, ETexListType tex_type);
@@ -134,7 +134,7 @@ public:
 
     void handleIRCallback(void **data, const S32 number);
 
-    S32 getNumImages()                  { return mImageList.size(); }
+    S32 getNumImages()                  { return static_cast<S32>(mImageList.size()); }
 
     // Local UI images
     // Local UI images
@@ -164,7 +164,7 @@ private:
 
     LLViewerFetchedTexture * getImage(const LLUUID &image_id,
                                      FTType f_type = FTT_DEFAULT,
-                                     BOOL usemipmap = TRUE,
+                                     bool usemipmap = true,
                                      LLViewerTexture::EBoostLevel boost_priority = LLGLTexture::BOOST_NONE,     // Get the requested level immediately upon creation.
                                      S8 texture_type = LLViewerTexture::FETCHED_TEXTURE,
                                      LLGLint internal_format = 0,
@@ -174,7 +174,7 @@ private:
 
     LLViewerFetchedTexture * getImageFromFile(const std::string& filename,
                                      FTType f_type = FTT_LOCAL_FILE,
-                                     BOOL usemipmap = TRUE,
+                                     bool usemipmap = true,
                                      LLViewerTexture::EBoostLevel boost_priority = LLGLTexture::BOOST_NONE,     // Get the requested level immediately upon creation.
                                      S8 texture_type = LLViewerTexture::FETCHED_TEXTURE,
                                      LLGLint internal_format = 0,
@@ -184,7 +184,7 @@ private:
 
     LLViewerFetchedTexture* getImageFromUrl(const std::string& url,
                                      FTType f_type,
-                                     BOOL usemipmap = TRUE,
+                                     bool usemipmap = true,
                                      LLViewerTexture::EBoostLevel boost_priority = LLGLTexture::BOOST_NONE,     // Get the requested level immediately upon creation.
                                      S8 texture_type = LLViewerTexture::FETCHED_TEXTURE,
                                      LLGLint internal_format = 0,
@@ -192,9 +192,12 @@ private:
                                      const LLUUID& force_id = LLUUID::null
                                      );
 
+    LLImageRaw* getRawImageFromMemory(const U8* data, U32 size, std::string_view mimetype);
+    LLViewerFetchedTexture* getImageFromMemory(const U8* data, U32 size, std::string_view mimetype);
+
     LLViewerFetchedTexture* createImage(const LLUUID &image_id,
                                      FTType f_type,
-                                     BOOL usemipmap = TRUE,
+                                     bool usemipmap = true,
                                      LLViewerTexture::EBoostLevel boost_priority = LLGLTexture::BOOST_NONE,     // Get the requested level immediately upon creation.
                                      S8 texture_type = LLViewerTexture::FETCHED_TEXTURE,
                                      LLGLint internal_format = 0,
@@ -205,7 +208,7 @@ private:
     // Request image from a specific host, used for baked avatar textures.
     // Implemented in header in case someone changes default params above. JC
     LLViewerFetchedTexture* getImageFromHost(const LLUUID& image_id, FTType f_type, LLHost host)
-    { return getImage(image_id, f_type, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE, 0, 0, host); }
+    { return getImage(image_id, f_type, true, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE, 0, 0, host); }
 
 public:
     typedef std::set<LLPointer<LLViewerFetchedTexture> > image_list_t;
@@ -217,7 +220,7 @@ public:
     // Note: just raw pointers because they are never referenced, just compared against
     std::set<LLViewerFetchedTexture*> mDirtyTextureList;
 
-    BOOL mForceResetTextureStats;
+    bool mForceResetTextureStats;
 
 private:
     typedef std::map< LLTextureKey, LLPointer<LLViewerFetchedTexture> > uuid_map_t;
@@ -230,7 +233,7 @@ private:
     // simply holds on to LLViewerFetchedTexture references to stop them from being purged too soon
     std::set<LLPointer<LLViewerFetchedTexture> > mImagePreloads;
 
-    BOOL mInitialized ;
+    bool mInitialized ;
     LLFrameTimer mForceDecodeTimer;
 
 private:
@@ -250,22 +253,22 @@ public:
 
     bool initFromFile();
 
-    LLPointer<LLUIImage> preloadUIImage(const std::string& name, const std::string& filename, BOOL use_mips, const LLRect& scale_rect, const LLRect& clip_rect, LLUIImage::EScaleStyle stype);
+    LLPointer<LLUIImage> preloadUIImage(const std::string& name, const std::string& filename, bool use_mips, const LLRect& scale_rect, const LLRect& clip_rect, LLUIImage::EScaleStyle stype);
 
-    static void onUIImageLoaded( BOOL success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* src_aux, S32 discard_level, BOOL final, void* userdata );
+    static void onUIImageLoaded( bool success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* src_aux, S32 discard_level, bool final, void* userdata );
 private:
     LLPointer<LLUIImage> loadUIImageByName(const std::string& name, const std::string& filename,
-                                   BOOL use_mips = FALSE, const LLRect& scale_rect = LLRect::null,
+                                   bool use_mips = false, const LLRect& scale_rect = LLRect::null,
                                    const LLRect& clip_rect = LLRect::null,
                                    LLViewerTexture::EBoostLevel boost_priority = LLGLTexture::BOOST_UI,
                                    LLUIImage::EScaleStyle = LLUIImage::SCALE_INNER);
     LLPointer<LLUIImage> loadUIImageByID(const LLUUID& id,
-                                 BOOL use_mips = FALSE, const LLRect& scale_rect = LLRect::null,
+                                 bool use_mips = false, const LLRect& scale_rect = LLRect::null,
                                  const LLRect& clip_rect = LLRect::null,
                                  LLViewerTexture::EBoostLevel boost_priority = LLGLTexture::BOOST_UI,
                                  LLUIImage::EScaleStyle = LLUIImage::SCALE_INNER);
 
-    LLPointer<LLUIImage> loadUIImage(LLViewerFetchedTexture* imagep, const std::string& name, BOOL use_mips = FALSE, const LLRect& scale_rect = LLRect::null, const LLRect& clip_rect = LLRect::null, LLUIImage::EScaleStyle = LLUIImage::SCALE_INNER);
+    LLPointer<LLUIImage> loadUIImage(LLViewerFetchedTexture* imagep, const std::string& name, bool use_mips = false, const LLRect& scale_rect = LLRect::null, const LLRect& clip_rect = LLRect::null, LLUIImage::EScaleStyle = LLUIImage::SCALE_INNER);
 
 
     struct LLUIImageLoadData
@@ -284,10 +287,10 @@ private:
     std::list< LLPointer<LLViewerFetchedTexture> > mUITextureList ;
 };
 
-const BOOL GLTEXTURE_TRUE = TRUE;
-const BOOL GLTEXTURE_FALSE = FALSE;
-const BOOL MIPMAP_TRUE = TRUE;
-const BOOL MIPMAP_FALSE = FALSE;
+const bool GLTEXTURE_TRUE = true;
+const bool GLTEXTURE_FALSE = false;
+const bool MIPMAP_TRUE = true;
+const bool MIPMAP_FALSE = false;
 
 extern LLViewerTextureList gTextureList;