summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexturelist.h
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-09-16 17:11:14 -0500
committerDave Parks <davep@lindenlab.com>2022-09-16 17:11:14 -0500
commitdc1ed195119d9ccc2b21111ea16663ffce4942c8 (patch)
treebf9266292ef68505c1ca51fc678c210a6ba732c6 /indra/newview/llviewertexturelist.h
parentae17d1e9a02769b352d03446ce7f7b7ccd800aec (diff)
parent5bb9b6cada31aedfd19b6947ddff0e07dc2b66b7 (diff)
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llviewertexturelist.h')
-rw-r--r--indra/newview/llviewertexturelist.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llviewertexturelist.h b/indra/newview/llviewertexturelist.h
index 4116be6528..b921225e39 100644
--- a/indra/newview/llviewertexturelist.h
+++ b/indra/newview/llviewertexturelist.h
@@ -98,8 +98,6 @@ public:
const S32 max_image_dimentions = LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT);
static LLPointer<LLImageJ2C> convertToUploadFile(LLPointer<LLImageRaw> raw_image, const S32 max_image_dimentions = LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT, bool force_lossless = false);
static void processImageNotInDatabase( LLMessageSystem *msg, void **user_data );
- static void receiveImageHeader(LLMessageSystem *msg, void **user_data);
- static void receiveImagePacket(LLMessageSystem *msg, void **user_data);
public:
LLViewerTextureList();