Fixed merge conflicts

1 files changed, 42 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 9d293fb..a4c3415 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,45 @@
+2009-04-02  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/llviewermedia.cpp:
+        Apply saved MediaDebugLevel at media init time.
+
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Plugged in LLMediaImplGStreamer::gstreamer_log().
+
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Implemented LLMediaImplGStreamer::gstreamer_log().
+        * linden/indra/llmedia/llmediaimplgstreamer.h:
+        Ditto.
+
+
+        * linden/indra/newview/llviewercontrol.cpp:
+        Implemented handleMediaDebugLevelChanged hook.
+
+
+2009-04-01  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/app_settings/settings.xml:
+        Added MediaDebugLevel setting in XML (does nothing yet).
+
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp: 
+        Implemented LLMediaImplGstreamer::setDebugLevel().
+        * linden/indra/llmedia/llmediaimplgstreamer.h: 
+        Ditto.
+
+
+        * linden/indra/llmedia/llmediaimplcommon.cpp: 
+        Added LLMediaImplCommon::setDebugLevel().
+        * linden/indra/llmedia/llmediaimplcommon.h:
+        Ditto.
+
+
+        * linden/indra/llmedia/llmediabase.h:
+        Added LLMediaBase::EDebugLevel and setDebugLevel prototype.
+
+
 2009-03-30  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/llmedia/llmediaimplgstreamer.cpp: