diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-11-16 18:58:21 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-11-16 18:58:21 +0000 |
| commit | f2f7034f2d358886ddb4137a7b5ab3c3f5717a4f (patch) | |
| tree | f5098b9532f6d7b757b9a8fb345e7aa5e7e69108 /indra/media_plugins/cef/media_plugin_cef.cpp | |
| parent | e95b7efd0b4469ce18bce3bc0261ecc9be06ea9c (diff) | |
| parent | 353329c2c2e9e8fa1ff273de2016c9e155585f45 (diff) | |
Merged in DV546-merge-6.5.1 (pull request #776)
DRTVWR-546 merge up to 6.5.1
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" //////////////////////////////////////////////////////////////////////////////// |