aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-11-09 16:46:14 -0700
committerMcCabe Maxsted2009-11-09 16:46:14 -0700
commit94f5d52da8253fc3c0c101bfe0b9abcf40ddffc4 (patch)
treeda8875ab7bd4cc4ff5baf35d6c4cd50d8e41b943
parentllpanellogin and llviewermessage now compile (diff)
downloadmeta-impy-94f5d52da8253fc3c0c101bfe0b9abcf40ddffc4.zip
meta-impy-94f5d52da8253fc3c0c101bfe0b9abcf40ddffc4.tar.gz
meta-impy-94f5d52da8253fc3c0c101bfe0b9abcf40ddffc4.tar.bz2
meta-impy-94f5d52da8253fc3c0c101bfe0b9abcf40ddffc4.tar.xz
Updated streaming video callback in llviewerparcelmedia
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/newview/llviewerparcelmedia.cpp6
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index b1e3bff..159343d 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -4,6 +4,11 @@
4 4
52009-11-09 McCabe Maxsted <hakushakukun@gmail.com> 52009-11-09 McCabe Maxsted <hakushakukun@gmail.com>
6 6
7 * Updated streaming video callback in llviewerparcelmedia.
8
9 modified: linden/indra/newview/llviewerparcelmedia.cpp
10
11
7 * llpanellogin and llviewermessage now compile. 12 * llpanellogin and llviewermessage now compile.
8 13
9 modified: linden/indra/newview/llpanellogin.cpp 14 modified: linden/indra/newview/llpanellogin.cpp
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}