diff options
author | McCabe Maxsted | 2009-11-09 16:46:14 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-11-09 16:46:14 -0700 |
commit | 94f5d52da8253fc3c0c101bfe0b9abcf40ddffc4 (patch) | |
tree | da8875ab7bd4cc4ff5baf35d6c4cd50d8e41b943 /linden | |
parent | llpanellogin and llviewermessage now compile (diff) | |
download | meta-impy-94f5d52da8253fc3c0c101bfe0b9abcf40ddffc4.zip meta-impy-94f5d52da8253fc3c0c101bfe0b9abcf40ddffc4.tar.gz meta-impy-94f5d52da8253fc3c0c101bfe0b9abcf40ddffc4.tar.bz2 meta-impy-94f5d52da8253fc3c0c101bfe0b9abcf40ddffc4.tar.xz |
Updated streaming video callback in llviewerparcelmedia
Diffstat (limited to 'linden')
-rw-r--r-- | linden/indra/newview/llviewerparcelmedia.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewerparcelmedia.cpp b/linden/indra/newview/llviewerparcelmedia.cpp index f27a140..b98f418 100644 --- a/linden/indra/newview/llviewerparcelmedia.cpp +++ b/linden/indra/newview/llviewerparcelmedia.cpp | |||
@@ -388,9 +388,13 @@ bool callback_play_media(const LLSD& notification, const LLSD& response, LLParce | |||
388 | S32 option = LLNotification::getSelectedOption(notification, response); | 388 | S32 option = LLNotification::getSelectedOption(notification, response); |
389 | if (option == 0) | 389 | if (option == 0) |
390 | { | 390 | { |
391 | LLParcel* parcel = (LLParcel*)data; | 391 | gSavedSettings.setBOOL("AudioStreamingVideo", TRUE); |
392 | LLViewerParcelMedia::play(parcel); | 392 | LLViewerParcelMedia::play(parcel); |
393 | } | 393 | } |
394 | else | ||
395 | { | ||
396 | gSavedSettings.setBOOL("AudioStreamingVideo", FALSE); | ||
397 | } | ||
394 | gSavedSettings.setWarning("FirstStreamingVideo", FALSE); | 398 | gSavedSettings.setWarning("FirstStreamingVideo", FALSE); |
395 | return false; | 399 | return false; |
396 | } | 400 | } |