1 files changed, 18 insertions, 0 deletions

diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index 2c48766..a81def7 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -70,6 +70,7 @@
 #include "llvosurfacepatch.h"
 #include "llvowlsky.h"
 #include "llrender.h"
+#include "llmediamanager.h"
 
 #ifdef TOGGLE_HACKED_GODLIKE_VIEWER
 BOOL                            gHackGodmode = FALSE;
@@ -431,6 +432,22 @@ bool handleVoiceClientPrefsChanged(const LLSD& newvalue)
         return true;
 }
 
+bool handleMediaDebugLevelChanged(const LLSD& newvalue)
+{
+        LLMediaManager *mgr = LLMediaManager::getInstance();
+        if (mgr)
+        {
+                LLMediaBase *impl = 
+                  mgr->createSourceFromMimeType("http", "audio/mpeg");
+
+                if (impl)
+                {
+                        impl->setDebugLevel( (LLMediaBase::EDebugLevel)newvalue.asInteger() );
+                }
+        }
+        return true;
+}
+
 ////////////////////////////////////////////////////////////////////////////
 
 void settings_setup_listeners()
@@ -560,6 +577,7 @@ void settings_setup_listeners()
         gSavedSettings.getControl("VoiceOutputAudioDevice")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
         gSavedSettings.getControl("AudioLevelMic")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
         gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));     
+        gSavedSettings.getControl("MediaDebugLevel")->getSignal()->connect(boost::bind(&handleMediaDebugLevelChanged, _1));     
 }
 
 template <> eControlType get_control_type<U32>(const U32& in, LLSD& out)