diff options
Diffstat (limited to 'indra/newview/llviewerparcelmedia.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmedia.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp index fe588534e5..05c589c398 100644 --- a/indra/newview/llviewerparcelmedia.cpp +++ b/indra/newview/llviewerparcelmedia.cpp @@ -50,7 +50,7 @@ S32 LLViewerParcelMedia::sMediaParcelLocalID = 0; LLUUID LLViewerParcelMedia::sMediaRegionID; // Local functions -void callback_play_media(S32 option, void* data); +bool callback_play_media(const LLSD& notification, const LLSD& response, LLParcel* parcel); // Move this to its own file. // helper class that tries to download a URL from a web site and calls a method @@ -167,8 +167,8 @@ void LLViewerParcelMedia::update(LLParcel* parcel) // First use warning if( gSavedSettings.getWarning("FirstStreamingVideo") ) { - gViewerWindow->alertXml("ParcelCanPlayMedia", - callback_play_media, (void*)parcel); + LLNotifications::instance().add("ParcelCanPlayMedia", LLSD(), LLSD(), + boost::bind(callback_play_media, _1, _2, parcel)); } @@ -192,7 +192,7 @@ void LLViewerParcelMedia::update(LLParcel* parcel) { gSavedSettings.setWarning("QuickTimeInstalled", FALSE); - LLNotifyBox::showXml("NoQuickTime" ); + LLNotifications::instance().add("NoQuickTime" ); }; } } @@ -382,9 +382,9 @@ void LLViewerParcelMedia::processParcelMediaUpdate( LLMessageSystem *msg, void * } } -void callback_play_media(S32 option, void* data) +bool callback_play_media(const LLSD& notification, const LLSD& response, LLParcel* parcel) { - LLParcel* parcel = (LLParcel*)data; + S32 option = LLNotification::getSelectedOption(notification, response); if (option == 0) { gSavedSettings.setBOOL("AudioStreamingVideo", TRUE); @@ -395,6 +395,6 @@ void callback_play_media(S32 option, void* data) gSavedSettings.setBOOL("AudioStreamingVideo", FALSE); } gSavedSettings.setWarning("FirstStreamingVideo", FALSE); - + return false; } |