diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-12-25 20:02:12 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-12-25 20:02:32 +0200 |
| commit | 693d9dc3bd608a5777dc8f6ac5f73b3ab796d392 (patch) | |
| tree | 222b36d46323afb235139ce73ddbd13ad75e4494 /indra/newview/llviewertexturelist.cpp | |
| parent | 098c4c0371f63b2b827131a13bfc623b8cb73f25 (diff) | |
| parent | 0a873cd95547f003878c6d00d0883ff792f4a865 (diff) | |
Merge master into DRTVWR-486
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
| -rw-r--r-- | indra/newview/llviewertexturelist.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 561319ca5d..38fccba169 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -41,9 +41,7 @@ #include "llsdserialize.h" #include "llsys.h" -#include "llvfs.h" -#include "llvfile.h" -#include "llvfsthread.h" +#include "llfilesystem.h" #include "llxmltree.h" #include "message.h" |