diff options
| author | callum_linden <none@none> | 2014-09-08 12:28:24 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-09-08 12:28:24 -0700 |
| commit | bd701ca99b7bd31559add2e94e533ee3bc3ff025 (patch) | |
| tree | 563d4b63b4c741c15d6767f67c5f9fb2f4f762ba /indra/media_plugins/quicktime | |
| parent | 77751a15d1dc976d77d41db5b586e18b5311ccb4 (diff) | |
| parent | eef4acc5367a486b0c52c6ce5e1aba995fefd99c (diff) | |
Merge with head of viewer-release
Diffstat (limited to 'indra/media_plugins/quicktime')
| -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 |