From 168d177197bd7558bbe0ca13d01c984ad8638da7 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Tue, 9 Mar 2021 14:39:51 -0800
Subject: This set of changes reverts the merge with master (git revert
 c83e740) and results in a version of the DRTVWR-519 that matches what was
 presemt before it was deployed as a release viewer *plus* 3 small fixes from
 Maxim (See commits).  This branch can now be used for additional fixes before
 eventually being used to release D-519 as normal

---
 indra/newview/llviewertexture.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llviewertexture.h')

diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h
index 69568cc825..07997e02a5 100644
--- a/indra/newview/llviewertexture.h
+++ b/indra/newview/llviewertexture.h
@@ -54,7 +54,7 @@ class LLTexturePipelineTester ;
 
 typedef	void	(*loaded_callback_func)( BOOL success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* src_aux, S32 discard_level, BOOL final, void* userdata );
 
-class LLVFile;
+class LLFileSystem;
 class LLMessageSystem;
 class LLViewerMediaImpl ;
 class LLVOVolume ;
-- 
cgit v1.2.3