diff options
author | Jacek Antonelli | 2008-08-15 23:45:23 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:23 -0500 |
commit | 486c4774ab4a707d69c1b48cdc048af1369084db (patch) | |
tree | 2a206a7e32a9a7efb98d585798a9fa18baeaf171 /linden/indra/llmedia/llmediaengine.cpp | |
parent | Second Life viewer sources 1.18.6.1-RC (diff) | |
download | meta-impy-486c4774ab4a707d69c1b48cdc048af1369084db.zip meta-impy-486c4774ab4a707d69c1b48cdc048af1369084db.tar.gz meta-impy-486c4774ab4a707d69c1b48cdc048af1369084db.tar.bz2 meta-impy-486c4774ab4a707d69c1b48cdc048af1369084db.tar.xz |
Second Life viewer sources 1.18.6.2-RC
Diffstat (limited to 'linden/indra/llmedia/llmediaengine.cpp')
-rw-r--r-- | linden/indra/llmedia/llmediaengine.cpp | 12 |
1 files changed, 12 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 @@ | |||
31 | 31 | ||
32 | #include "linden_common.h" | 32 | #include "linden_common.h" |
33 | #include "llmediaengine.h" | 33 | #include "llmediaengine.h" |
34 | #include "llmediaimplquicktime.h" | ||
34 | 35 | ||
35 | #include "indra_constants.h" | 36 | #include "indra_constants.h" |
36 | #include "llstring.h" | 37 | #include "llstring.h" |
@@ -621,3 +622,14 @@ void LLMediaEngine::getNetworkProxy ( BOOL& enabledOut, LLString& addressOut, | |||
621 | excludeOut = mProxyExlude; | 622 | excludeOut = mProxyExlude; |
622 | } | 623 | } |
623 | 624 | ||
625 | // get QuickTime version (returned as a number which | ||
626 | // only makes sense viewed as hex | ||
627 | S32 LLMediaEngine::getQuickTimeVersion() | ||
628 | { | ||
629 | #if LL_QUICKTIME_ENABLED | ||
630 | return LLMediaImplQuickTime::getVersion(); | ||
631 | #else | ||
632 | return -1; | ||
633 | #endif | ||
634 | } | ||
635 | |||