Merge branch '1.2.0-streaminfo' into 1.2.0-next

1 files changed, 23 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index ac45ede..e2ec419 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -551,6 +551,29 @@
         * Online/Offline notifications now always show in IM windows.
         
                 modified:   linden/indra/newview/llcallingcard.cpp
+        
+        
+        * Audio stream track info displayed in chat instead of notices.
+        
+                modified:   indra/newview/lloverlaybar.cpp
+                
+                
+        * Fixed stream info not updating.
+        
+                modified:   indra/llmedia/llmediaimplgstreamer.cpp
+                
+        
+  Dale Glass  <email@unknown.com>       
+
+        * VWR-12655: Add support for displaying the title of the song.          
+        
+                modified:   indra/llaudio/audioengine.h
+                modified:   indra/llmedia/llmediaimplgstreamer.cpp
+                modified:   indra/llmedia/llmediaimplgstreamer.h
+                modified:   indra/llmedia/llmediaobserver.h
+                modified:   indra/newview/app_settings/settings.xml
+                modified:   indra/newview/lloverlaybar.cpp
+                modified:   indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
 
 
 2009-06-13  McCabe Maxsted  <hakushakukun@gmail.com>