4 files changed, 29 insertions, 0 deletions

diff --git a/linden/indra/llmedia/llmediaengine.cpp b/linden/indra/llmedia/llmediaengine.cpp
index c0e904b..e0c532a 100644
--- a/linden/indra/llmedia/llmediaengine.cpp
+++ b/linden/indra/llmedia/llmediaengine.cpp
@@ -31,6 +31,7 @@
 
 #include "linden_common.h" 
 #include "llmediaengine.h"
+#include "llmediaimplquicktime.h"
 
 #include "indra_constants.h"
 #include "llstring.h"
@@ -621,3 +622,14 @@ void LLMediaEngine::getNetworkProxy ( BOOL& enabledOut, LLString& addressOut,
         excludeOut = mProxyExlude;
 }
 
+// get QuickTime version (returned as a number which
+// only makes sense viewed as hex
+S32 LLMediaEngine::getQuickTimeVersion()
+{
+#if LL_QUICKTIME_ENABLED
+        return LLMediaImplQuickTime::getVersion();
+#else
+        return -1;
+#endif
+}
+
diff --git a/linden/indra/llmedia/llmediaengine.h b/linden/indra/llmedia/llmediaengine.h
index e585c13..836e075 100644
--- a/linden/indra/llmedia/llmediaengine.h
+++ b/linden/indra/llmedia/llmediaengine.h
@@ -42,6 +42,9 @@
 
 #include "message.h"
 
+// current version on my Windows system after a 7.3.1 update is 120684544 (dec) and 7318000 (hex)
+#define LL_MIN_QUICKTIME_VERSION   ( 120684544 )
+
 //////////////////////////////////////////////////////////////////////////////
 // media engine singleton
 class LLMediaEngine
@@ -83,6 +86,7 @@ public:
         void setAutoScaled ( BOOL autoScaledIn );
         BOOL isAutoScaled ();
         BOOL setVolume ( F32 volumeIn );
+        S32 getQuickTimeVersion();
 
         void setUrl ( const LLString& urlIn );
         const LLString& getUrl ();
diff --git a/linden/indra/llmedia/llmediaimplquicktime.cpp b/linden/indra/llmedia/llmediaimplquicktime.cpp
index 8bf119f..d5b3012 100644
--- a/linden/indra/llmedia/llmediaimplquicktime.cpp
+++ b/linden/indra/llmedia/llmediaimplquicktime.cpp
@@ -912,4 +912,13 @@ getMediaDuration () const
         return result;
 }
 
+// static since we need this before an impl is created by media manager
+S32 LLMediaImplQuickTime::getVersion()
+{
+        S32 version;
+        Gestalt( gestaltQuickTimeVersion, (long*)&version );
+
+        return version;
+}
+
 #endif
diff --git a/linden/indra/llmedia/llmediaimplquicktime.h b/linden/indra/llmedia/llmediaimplquicktime.h
index 4d6d81d..8345b41 100644
--- a/linden/indra/llmedia/llmediaimplquicktime.h
+++ b/linden/indra/llmedia/llmediaimplquicktime.h
@@ -47,6 +47,7 @@
 #include "QTML.h"
 #include "Movies.h"
 #include "FixMath.h"
+#include "Gestalt.h"
 #include "QuickTimeStreaming.h"
 #endif
 #endif
@@ -99,6 +100,9 @@ class LLMediaImplQuickTime:
                 virtual U8* getMediaData ();
                 virtual F64 getMediaDuration () const;
 
+                // static since we need this before an impl is created by media manager
+                static S32 getVersion();
+
         private:
                 // quicktime specific
                 Movie theMovie;