diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-09-08 15:24:22 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-09-08 15:24:22 -0400 |
| commit | bff5a4e7940d40576f52105ab9877f5a6b7d85c8 (patch) | |
| tree | 9a87e704499c62858c9f449814bb744e2a0a26ab /indra/media_plugins | |
| parent | 0c20beda6800149ee71a307ca4e943b5bba56908 (diff) | |
| parent | eef4acc5367a486b0c52c6ce5e1aba995fefd99c (diff) | |
Merge. Update from viewer-release after 3.7.15 release.
Diffstat (limited to 'indra/media_plugins')
| -rwxr-xr-x | indra/media_plugins/quicktime/media_plugin_quicktime.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp index 93d2a8fa6e..ff1ed8bfbc 100755 --- a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp +++ b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp @@ -28,26 +28,26 @@ #include "linden_common.h" -#if defined(LL_DARWIN) - #include <QuickTime/QuickTime.h> -#elif defined(LL_WINDOWS) - #include "llwin32headers.h" - #include "MacTypes.h" - #include "QTML.h" - #include "Movies.h" - #include "QDoffscreen.h" - #include "FixMath.h" - #include "QTLoadLibraryUtils.h" -#endif - #include "llgl.h" - + #include "llplugininstance.h" #include "llpluginmessage.h" #include "llpluginmessageclasses.h" #include "media_plugin_base.h" - + #if LL_QUICKTIME_ENABLED + +#if defined(LL_DARWIN) +#include <QuickTime/QuickTime.h> +#elif defined(LL_WINDOWS) +#include "llwin32headers.h" +#include "MacTypes.h" +#include "QTML.h" +#include "Movies.h" +#include "QDoffscreen.h" +#include "FixMath.h" +#include "QTLoadLibraryUtils.h" +#endif |