diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-12-26 14:01:06 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-12-26 14:01:06 +0200 |
| commit | 747dbb7da2482ce00b15b268344ad1306ea850cf (patch) | |
| tree | f6fb6731f8f851087d4d7011ca02e96d03187116 /indra/newview/llviewertexlayer.cpp | |
| parent | 8b3a19f19c3215c9d83d4d89c9c0a6a6e2ea3230 (diff) | |
| parent | 0a873cd95547f003878c6d00d0883ff792f4a865 (diff) | |
Merge branch 'master' into DRTVWR-540-maint
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" |