1 files changed, 29 insertions, 0 deletions

diff --git a/linden/indra/newview/llviewerparcelmedia.cpp b/linden/indra/newview/llviewerparcelmedia.cpp
index 2925b8d..9180fb2 100644
--- a/linden/indra/newview/llviewerparcelmedia.cpp
+++ b/linden/indra/newview/llviewerparcelmedia.cpp
@@ -41,6 +41,7 @@
 #include "lluuid.h"
 #include "message.h"
 #include "llviewerparcelmediaautoplay.h"
+#include "llviewerwindow.h"
 #include "llfirstuse.h"
 
 // Static Variables
@@ -48,6 +49,9 @@
 S32 LLViewerParcelMedia::sMediaParcelLocalID = 0;
 LLUUID LLViewerParcelMedia::sMediaRegionID;
 
+// Local functions
+void callback_play_media(S32 option, void* data);
+
 // Move this to its own file.
 // helper class that tries to download a URL from a web site and calls a method
 // on the Panel Land Media and to discover the MIME type
@@ -152,6 +156,14 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
                                         LLViewerMedia::setMimeType(parcel->getMediaType());
                                 }
 
+                                // First use warning
+                                if(     gSavedSettings.getWarning("FirstStreamingVideo") )
+                                {
+                                        gViewerWindow->alertXml("ParcelCanPlayMedia",
+                                                callback_play_media, (void*)parcel);
+
+                                }
+
                         }
                 }
                 else
@@ -361,3 +373,20 @@ 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);
+                LLViewerParcelMedia::play(parcel);
+        }
+        else
+        {
+                gSavedSettings.setBOOL("AudioStreamingVideo", FALSE);
+        }
+        gSavedSettings.setWarning("FirstStreamingVideo", FALSE);
+
+}
+