summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.h
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2024-05-30 16:28:56 -0500
committerGitHub <noreply@github.com>2024-05-30 16:28:56 -0500
commitd1a8a9d0c39bff726e8c298c5bad309055726a30 (patch)
treeed22bacafc1c42d458cf2c166b6ebb7364a946b5 /indra/newview/llviewertexture.h
parent0a4d37f22f78ff0b6095237c7c90bfb627464a94 (diff)
#1596 Fix for GLTF uploads failing after loading from .glb file (#1602)
Diffstat (limited to 'indra/newview/llviewertexture.h')
-rw-r--r--indra/newview/llviewertexture.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h
index 3c4a5c18ac..dc9182bf1b 100644
--- a/indra/newview/llviewertexture.h
+++ b/indra/newview/llviewertexture.h
@@ -690,6 +690,12 @@ public:
static LLViewerFetchedTexture* getFetchedTextureFromHost(const LLUUID& image_id, FTType f_type, LLHost host) ;
+ // decode a given image data according to given mime type
+ // WARNING: caller is responsible for deleting the returned raw image
+ static LLImageRaw* getRawImageFromMemory(const U8* data, U32 size, std::string_view mimetype);
+
+ // decode given image data according to given mime type
+ // WARNING: caller is responsible for deleting the returned image
static LLViewerFetchedTexture* getFetchedTextureFromMemory(const U8* data, U32 size, std::string_view mimetype);
static void init() ;