diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-09-08 15:46:29 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-09-08 15:46:29 -0400 |
| commit | ac62e322ce0060758afca2007469dd25a3d64d48 (patch) | |
| tree | c86f24d832bb5c5006c5dc95a28e59d1dbdc4c1f /indra/media_plugins | |
| parent | ee4cd594623eff6f04cfc2bafb937f0cfd631080 (diff) | |
| parent | bff5a4e7940d40576f52105ab9877f5a6b7d85c8 (diff) | |
Merge. Refresh from viewer-drano-http-4 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 |