Merge commit 'mccabe/next' into next

1 files changed, 1 insertions, 7 deletions

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);
-
 }