diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:24:03 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:24:03 +0200 |
| commit | ab4d4a4817a3c885e5a21bf1d89119dd5bc37c4f (patch) | |
| tree | 6fa087eecf4ebd2fb984b3ecb54fd3286c762478 /indra/newview/llviewertexlayer.cpp | |
| parent | 0505c6ebbb9060d215f61884d06f22d64d2aaf6d (diff) | |
| parent | 0bffd3d365023fea504b1070480e7b2f72080129 (diff) | |
Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360
# Conflicts:
# indra/newview/app_settings/settings.xml
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" |