diff options
| author | Jacek Antonelli | 2009-04-06 01:51:38 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-04-06 01:52:15 -0500 |
| commit | bcf93cd3a302fd4cc1f8cf82c47a5b863dc2d937 (patch) | |
| tree | 7b2154384c2d1339c6c030e237e3ea6ba7e19e94 /linden/indra/newview/llviewermedia.cpp | |
| parent | Changed the login splash screen URL. (diff) | |
| parent | Merge branch gst-thread into gst-revamp (diff) | |
| download | meta-impy-bcf93cd3a302fd4cc1f8cf82c47a5b863dc2d937.zip meta-impy-bcf93cd3a302fd4cc1f8cf82c47a5b863dc2d937.tar.gz meta-impy-bcf93cd3a302fd4cc1f8cf82c47a5b863dc2d937.tar.bz2 meta-impy-bcf93cd3a302fd4cc1f8cf82c47a5b863dc2d937.tar.xz | |
Merge branch 'gst-revamp' into next
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llviewermedia.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp index e99c838..d8fcdcb 100644 --- a/linden/indra/newview/llviewermedia.cpp +++ b/linden/indra/newview/llviewermedia.cpp | |||
| @@ -496,6 +496,13 @@ void LLViewerMedia::initClass() | |||
| 496 | const LLMIMETypes::LLMIMEInfo& info = it->second; | 496 | const LLMIMETypes::LLMIMEInfo& info = it->second; |
| 497 | mm->addMimeTypeImplNameMap( mime_type, info.mImpl ); | 497 | mm->addMimeTypeImplNameMap( mime_type, info.mImpl ); |
| 498 | } | 498 | } |
| 499 | |||
| 500 | LLMediaBase *impl = mm->createSourceFromMimeType("http", "audio/mpeg"); | ||
| 501 | if (impl) | ||
| 502 | { | ||
| 503 | U32 level = gSavedSettings.getU32("MediaDebugLevel"); | ||
| 504 | impl->setDebugLevel( (LLMediaBase::EDebugLevel)level ); | ||
| 505 | } | ||
| 499 | } | 506 | } |
| 500 | 507 | ||
| 501 | ////////////////////////////////////////////////////////////////////////////////////////// | 508 | ////////////////////////////////////////////////////////////////////////////////////////// |