Fixed missing music prompt (streaming now enabled by default)

5 files changed, 93 insertions, 22 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index b2ef908..2932ab4 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -2,6 +2,53 @@
 =-                         1.1.0 RC1                      -=
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
+2009-02-14  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/newview/app_settings/settings.xml:
+        Fixed missing music prompt (streaming now enabled by default).
+        * linden/indra/newview/llviewerparcelmedia.cpp:
+        Ditto.
+        * linden/indra/newview/llviewerparcelmgr.cpp:
+        Ditto.
+        * linden/indra/newview/skins/default/xui/en-us/alerts.xml:
+        Ditto.
+
+
+2009-02-13  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Removed junk code from GStreamer.
+        * linden/indra/llmedia/llmediaimplgstreamer.h:
+        Ditto.
+        * linden/indra/llmedia/llmediaimplgstreamervidplug.cpp:
+        Ditto.
+
+        * linden/indra/newview/app_settings/settings.xml:
+        Fixed sound settings not being correctly muted.
+        * linden/indra/newview/llviewermessage.cpp:
+        Ditto.
+        * linden/indra/newview/llviewerobject.cpp:
+        Ditto.
+        * linden/indra/newview/llvoavatar.cpp:
+        Ditto.
+
+
+        Armin Weatherwax  <email@unknown.com>
+
+        * linden/indra/newview/llpreviewlandmark.cpp:
+        Removed search for non-existant floater_preview_new_landmark.xml.
+
+
+        Anders Arnholm  <anders@arnholm.se>
+        * linden/indra/llui/lltexteditor.cpp:
+        Fixed crash in LLTextEditor::findHTML
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Added artist/title tag info support.
+        * linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc:
+        Ditto.
+
+
 2009-02-04  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/cmake/CopyWinLibs.cmake:
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 779b668..fbb620c 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -317,7 +317,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>AudioStreamingVideo</key>
     <map>
@@ -328,7 +328,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>AutoAcceptNewInventory</key>
     <map>
diff --git a/linden/indra/newview/llviewerparcelmedia.cpp b/linden/indra/newview/llviewerparcelmedia.cpp
index 956ed03..94f6d84 100644
--- a/linden/indra/newview/llviewerparcelmedia.cpp
+++ b/linden/indra/newview/llviewerparcelmedia.cpp
@@ -384,17 +384,11 @@ void LLViewerParcelMedia::processParcelMediaUpdate( LLMessageSystem *msg, void *
 
 void callback_play_media(S32 option, void* data)
 {
-        LLParcel* parcel = (LLParcel*)data;
         if (option == 0)
         {
-                gSavedSettings.setBOOL("AudioStreamingVideo", TRUE);
+                LLParcel* parcel = (LLParcel*)data;
                 LLViewerParcelMedia::play(parcel);
         }
-        else
-        {
-                gSavedSettings.setBOOL("AudioStreamingVideo", FALSE);
-        }
         gSavedSettings.setWarning("FirstStreamingVideo", FALSE);
-
 }
 
diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index 5ef6f83..e27e284 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -1692,7 +1692,12 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
 
 void optionally_start_music(const std::string& music_url)
 {
-        if (gSavedSettings.getBOOL("AudioStreamingMusic"))
+        // Check to see if this your first time on a music-enabled parcel.
+        if (gSavedSettings.getWarning("FirstStreamingMusic"))
+        {
+                gViewerWindow->alertXml("ParcelCanPlayMusic", callback_start_music, (void*)&music_url);
+        }
+        else if (gSavedSettings.getBOOL("AudioStreamingMusic"))
         {
                 // Make the user click the start button on the overlay bar. JC
                 //              llinfos << "Starting parcel music " << music_url << llendl;
@@ -1706,6 +1711,19 @@ void optionally_start_music(const std::string& music_url)
         }
 }
 
+
+void callback_start_music(S32 option, void* data)
+{
+        if (option == 0)
+        {
+                // Before the callback, we verified the url was good.
+                // We fetch again to avoid lag while loading.
+                LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();          
+                gAudiop->startInternetStream(parcel->getMusicURL());
+        }
+        gSavedSettings.setWarning("FirstStreamingMusic", FALSE);
+}
+
 // static
 void LLViewerParcelMgr::processParcelAccessListReply(LLMessageSystem *msg, void **user)
 {
diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index 0be529f..92e2014 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -1893,20 +1893,32 @@ Try selecting a single parcel.
                         Region Not Found
                 </message>
         </alert>
-        <alert modal="true" name="ParcelCanPlayMedia">
-                <message name="message">
-                        This location can play streaming media. 
-Streaming media requires a fast Internet connection.
- 
-Play streaming media when available?
-(You can change this option later under 
-Preferences &gt; Audio &amp; Video.)
-                </message>
+  <alert modal="true" name="ParcelCanPlayMusic">
+    <message name="message">
+      This location wants to play streaming music.
+      (Requires a fast Internet connection.)
+
+      Play streaming music now?
+    </message>
+    <option name="PlayMusic">
+      Yes
+    </option>
+    <option name="No">
+      No
+    </option>
+  </alert>
+  <alert modal="true" name="ParcelCanPlayMedia">
+    <message name="message">
+      This location wants to play streaming media.
+      (Requires a fast Internet connection.)
+
+      Play streaming media now?
+    </message>
                 <option name="PlayMedia">
-                        Play Media
+                        Yes
                 </option>
-                <option name="Disable">
-                        Disable
+                <option name="No">
+                        No
                 </option>
         </alert>
         <alert modal="true" name="CannotDeedLandWaitingForServer">