diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-11-16 02:22:54 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-11-16 02:22:54 +0200 |
| commit | 5ccdcf51a3b4cb46a8c9134636bc3bd5f2129f92 (patch) | |
| tree | fd0dbaf5b47674beaf7abd159bfec5fcd1428766 /indra/media_plugins/cef/media_plugin_cef.cpp | |
| parent | 3641541c6cc7f33f0e0dc2e1eb2cfdfcec23322b (diff) | |
| parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) | |
Merge branch master (DRTVWR-545) into DRTVWR-542-meshopt
Diffstat (limited to 'indra/media_plugins/cef/media_plugin_cef.cpp')
| -rw-r--r-- | indra/media_plugins/cef/media_plugin_cef.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 8465285d2b..11dec63cd3 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -29,7 +29,7 @@ #include "linden_common.h" #include "indra_constants.h" // for indra keyboard codes -#include "llgl.h" +#include "llglheaders.h" // for GL_* constants #include "llsdutil.h" #include "llplugininstance.h" #include "llpluginmessage.h" @@ -37,9 +37,6 @@ #include "volume_catcher.h" #include "media_plugin_base.h" -#include <functional> -#include <chrono> - #include "dullahan.h" //////////////////////////////////////////////////////////////////////////////// |