diff options
author | Euclid Linden <euclid@lindenlab.com> | 2021-12-15 20:34:49 +0000 |
---|---|---|
committer | Euclid Linden <euclid@lindenlab.com> | 2021-12-15 20:34:49 +0000 |
commit | 0cb712af5cc8be9025fce82eac65408fab759505 (patch) | |
tree | 0361f80565053ec2183277eeb73c6c6dbf8d06f6 /indra/newview/llviewertexlayer.cpp | |
parent | 101e282ca3d0e8ca0bf10b32a2a4b6362bc66b80 (diff) | |
parent | e27f9551e1cae0f3fca22989bcbd256a876fd80d (diff) |
Merged in DV528-merge-6.5.2 (pull request #813)
DRTVWR-528 merge up to 6.5.2
Diffstat (limited to 'indra/newview/llviewertexlayer.cpp')
-rw-r--r-- | indra/newview/llviewertexlayer.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llviewertexlayer.cpp b/indra/newview/llviewertexlayer.cpp index c501dd0035..4c2fbcf837 100644 --- a/indra/newview/llviewertexlayer.cpp +++ b/indra/newview/llviewertexlayer.cpp @@ -31,8 +31,6 @@ #include "llagent.h" #include "llimagej2c.h" #include "llnotificationsutil.h" -#include "llvfile.h" -#include "llvfs.h" #include "llviewerregion.h" #include "llglslshader.h" #include "llvoavatarself.h" |