diff options
author | Jacek Antonelli | 2009-04-02 03:25:31 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-04-02 03:27:26 -0500 |
commit | bfde51e169465842e18231fef56f02f06c1b0620 (patch) | |
tree | 1bd31fa78c9cdda8926985a2a5d2263697de3568 | |
parent | Plugged in LLMediaImplGStreamer::gstreamer_log(). (diff) | |
download | meta-impy-bfde51e169465842e18231fef56f02f06c1b0620.zip meta-impy-bfde51e169465842e18231fef56f02f06c1b0620.tar.gz meta-impy-bfde51e169465842e18231fef56f02f06c1b0620.tar.bz2 meta-impy-bfde51e169465842e18231fef56f02f06c1b0620.tar.xz |
Apply saved MediaDebugLevel at media init time.
Diffstat (limited to '')
-rw-r--r-- | ChangeLog.txt | 4 | ||||
-rw-r--r-- | linden/indra/newview/llviewermedia.cpp | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index c680f42..5658337 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,5 +1,9 @@ | |||
1 | 2009-04-02 Jacek Antonelli <jacek.antonelli@gmail.com> | 1 | 2009-04-02 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 2 | ||
3 | * linden/indra/newview/llviewermedia.cpp: | ||
4 | Apply saved MediaDebugLevel at media init time. | ||
5 | |||
6 | |||
3 | * linden/indra/llmedia/llmediaimplgstreamer.cpp: | 7 | * linden/indra/llmedia/llmediaimplgstreamer.cpp: |
4 | Plugged in LLMediaImplGStreamer::gstreamer_log(). | 8 | Plugged in LLMediaImplGStreamer::gstreamer_log(). |
5 | 9 | ||
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 | ////////////////////////////////////////////////////////////////////////////////////////// |