diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-03-02 14:25:36 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-03-02 14:25:36 -0700 |
| commit | 363bc9d9d0fe4f42b0dfbdb7adeb9a481a4fe55b (patch) | |
| tree | 600cd078a00e80a33504c748540e333a34a4b30d /indra/newview/llviewertexturelist.cpp | |
| parent | 31bca613a6011f5e1a95cffafd283e445142557f (diff) | |
| parent | 2b385841f3031d599bdb226f0f859e51b09870f8 (diff) | |
Merge branch 'master' v 6.4.15 into DRTVWR-525
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" |