diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-09-08 14:36:08 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-09-08 14:36:08 -0700 |
| commit | 873a72fdbad8bca29cf8129b318719c1af5f8e9d (patch) | |
| tree | cf4138d025faf4c697de287a4c9a441432c11e6c /indra/media_plugins | |
| parent | 4e84aa4ecfe3351463ca9c54df4477528f65e41f (diff) | |
| parent | eef4acc5367a486b0c52c6ce5e1aba995fefd99c (diff) | |
Merge with 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 |