merge release@83343 skinning-1-merge@83714 -> release

QAR-424

1 files changed, 5 insertions, 0 deletions

diff --git a/indra/newview/lltexturecache.h b/indra/newview/lltexturecache.h
index e3d3fa3977..28b33d5c4e 100644
--- a/indra/newview/lltexturecache.h
+++ b/indra/newview/lltexturecache.h
@@ -44,6 +44,8 @@ class LLTextureCacheWorker;
 class LLTextureCache : public LLWorkerThread
 {
 	friend class LLTextureCacheWorker;
+	friend class LLTextureCacheRemoteWorker;
+	friend class LLTextureCacheLocalFileWorker;
 
 public:
 
@@ -81,6 +83,9 @@ public:
 	void purgeCache(ELLPath location);
 	S64 initCache(ELLPath location, S64 maxsize, BOOL read_only);
 
+	handle_t readFromCache(const LLString& local_filename, const LLUUID& id, U32 priority, S32 offset, S32 size,
+						   ReadResponder* responder);
+
 	handle_t readFromCache(const LLUUID& id, U32 priority, S32 offset, S32 size,
 						   ReadResponder* responder);
 	bool readComplete(handle_t handle, bool abort);