diff options
author | McCabe Maxsted | 2009-02-14 23:12:10 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-02-14 23:12:10 -0700 |
commit | e6cda8b59b9b52617a4c40a9ae6111403a3dba2f (patch) | |
tree | 634a47b5ff5c6a908111da0bb59b39c433cb7dc1 /linden/indra/newview/llviewerparcelmedia.cpp | |
parent | develop.py should now work again under windows (diff) | |
download | meta-impy-e6cda8b59b9b52617a4c40a9ae6111403a3dba2f.zip meta-impy-e6cda8b59b9b52617a4c40a9ae6111403a3dba2f.tar.gz meta-impy-e6cda8b59b9b52617a4c40a9ae6111403a3dba2f.tar.bz2 meta-impy-e6cda8b59b9b52617a4c40a9ae6111403a3dba2f.tar.xz |
Fixed missing music prompt (streaming now enabled by default)
Diffstat (limited to 'linden/indra/newview/llviewerparcelmedia.cpp')
-rw-r--r-- | linden/indra/newview/llviewerparcelmedia.cpp | 8 |
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 * | |||
384 | 384 | ||
385 | void callback_play_media(S32 option, void* data) | 385 | void callback_play_media(S32 option, void* data) |
386 | { | 386 | { |
387 | LLParcel* parcel = (LLParcel*)data; | ||
388 | if (option == 0) | 387 | if (option == 0) |
389 | { | 388 | { |
390 | gSavedSettings.setBOOL("AudioStreamingVideo", TRUE); | 389 | LLParcel* parcel = (LLParcel*)data; |
391 | LLViewerParcelMedia::play(parcel); | 390 | LLViewerParcelMedia::play(parcel); |
392 | } | 391 | } |
393 | else | ||
394 | { | ||
395 | gSavedSettings.setBOOL("AudioStreamingVideo", FALSE); | ||
396 | } | ||
397 | gSavedSettings.setWarning("FirstStreamingVideo", FALSE); | 392 | gSavedSettings.setWarning("FirstStreamingVideo", FALSE); |
398 | |||
399 | } | 393 | } |
400 | 394 | ||