diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-08-06 16:17:55 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-08-06 16:17:55 -0400 |
| commit | 7062026da4d6cbdeb6a039f0e6ec387586269c65 (patch) | |
| tree | dc2874cfc7883f371080543264d3e460143e3aff /indra/media_plugins/quicktime/media_plugin_quicktime.cpp | |
| parent | 129c2db2d258e3618dcff557c89e083e449d74d4 (diff) | |
| parent | 3b95bffeddc200e42d7f2b31e5df53a88b81b925 (diff) | |
merge changes for STORM-2030
Diffstat (limited to 'indra/media_plugins/quicktime/media_plugin_quicktime.cpp')
| -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 |