aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerparcelmedia.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2009-04-30 13:04:20 -0500
committerJacek Antonelli2009-04-30 13:07:16 -0500
commitca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch)
tree8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/newview/llviewerparcelmedia.cpp
parentSecond Life viewer sources 1.22.11 (diff)
downloadmeta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip
meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz
meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2
meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz
Second Life viewer sources 1.23.0-RC
Diffstat (limited to 'linden/indra/newview/llviewerparcelmedia.cpp')
-rw-r--r--linden/indra/newview/llviewerparcelmedia.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/linden/indra/newview/llviewerparcelmedia.cpp b/linden/indra/newview/llviewerparcelmedia.cpp
index f6198ca..b98f418 100644
--- a/linden/indra/newview/llviewerparcelmedia.cpp
+++ b/linden/indra/newview/llviewerparcelmedia.cpp
@@ -17,7 +17,8 @@
17 * There are special exceptions to the terms and conditions of the GPL as 17 * There are special exceptions to the terms and conditions of the GPL as
18 * it is applied to this Source Code. View the full text of the exception 18 * it is applied to this Source Code. View the full text of the exception
19 * in the file doc/FLOSS-exception.txt in this software distribution, or 19 * in the file doc/FLOSS-exception.txt in this software distribution, or
20 * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception 20 * online at
21 * http://secondlifegrid.net/programs/open_source/licensing/flossexception
21 * 22 *
22 * By copying, modifying or distributing this software, you acknowledge 23 * By copying, modifying or distributing this software, you acknowledge
23 * that you have read and understood your obligations described above, 24 * that you have read and understood your obligations described above,
@@ -50,7 +51,7 @@ S32 LLViewerParcelMedia::sMediaParcelLocalID = 0;
50LLUUID LLViewerParcelMedia::sMediaRegionID; 51LLUUID LLViewerParcelMedia::sMediaRegionID;
51 52
52// Local functions 53// Local functions
53void callback_play_media(S32 option, void* data); 54bool callback_play_media(const LLSD& notification, const LLSD& response, LLParcel* parcel);
54 55
55// Move this to its own file. 56// Move this to its own file.
56// helper class that tries to download a URL from a web site and calls a method 57// helper class that tries to download a URL from a web site and calls a method
@@ -167,8 +168,8 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
167 // First use warning 168 // First use warning
168 if( gSavedSettings.getWarning("FirstStreamingVideo") ) 169 if( gSavedSettings.getWarning("FirstStreamingVideo") )
169 { 170 {
170 gViewerWindow->alertXml("ParcelCanPlayMedia", 171 LLNotifications::instance().add("ParcelCanPlayMedia", LLSD(), LLSD(),
171 callback_play_media, (void*)parcel); 172 boost::bind(callback_play_media, _1, _2, parcel));
172 173
173 } 174 }
174 175
@@ -192,7 +193,7 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
192 { 193 {
193 gSavedSettings.setWarning("QuickTimeInstalled", FALSE); 194 gSavedSettings.setWarning("QuickTimeInstalled", FALSE);
194 195
195 LLNotifyBox::showXml("NoQuickTime" ); 196 LLNotifications::instance().add("NoQuickTime" );
196 }; 197 };
197 } 198 }
198 } 199 }
@@ -382,9 +383,9 @@ void LLViewerParcelMedia::processParcelMediaUpdate( LLMessageSystem *msg, void *
382 } 383 }
383} 384}
384 385
385void callback_play_media(S32 option, void* data) 386bool callback_play_media(const LLSD& notification, const LLSD& response, LLParcel* parcel)
386{ 387{
387 LLParcel* parcel = (LLParcel*)data; 388 S32 option = LLNotification::getSelectedOption(notification, response);
388 if (option == 0) 389 if (option == 0)
389 { 390 {
390 gSavedSettings.setBOOL("AudioStreamingVideo", TRUE); 391 gSavedSettings.setBOOL("AudioStreamingVideo", TRUE);
@@ -395,6 +396,6 @@ void callback_play_media(S32 option, void* data)
395 gSavedSettings.setBOOL("AudioStreamingVideo", FALSE); 396 gSavedSettings.setBOOL("AudioStreamingVideo", FALSE);
396 } 397 }
397 gSavedSettings.setWarning("FirstStreamingVideo", FALSE); 398 gSavedSettings.setWarning("FirstStreamingVideo", FALSE);
398 399 return false;
399} 400}
400 401