diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
| commit | a4000c3744e42fcbb638e742f3b63fa31a0dee15 (patch) | |
| tree | 7f472c30e65bbfa04ee9bc06631a1af305cc31fb /indra/newview/llviewerparcelmedia.cpp | |
| parent | 6c4cadbb04d633ad7b762058bdeba6e1f650dafd (diff) | |
merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7
Diffstat (limited to 'indra/newview/llviewerparcelmedia.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmedia.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp index b98f418d49..08e03c97f2 100644 --- a/indra/newview/llviewerparcelmedia.cpp +++ b/indra/newview/llviewerparcelmedia.cpp @@ -166,7 +166,7 @@ void LLViewerParcelMedia::update(LLParcel* parcel) } // First use warning - if( gSavedSettings.getWarning("FirstStreamingVideo") ) + if( gWarningSettings.getBOOL("FirstStreamingVideo") ) { LLNotifications::instance().add("ParcelCanPlayMedia", LLSD(), LLSD(), boost::bind(callback_play_media, _1, _2, parcel)); @@ -189,9 +189,9 @@ void LLViewerParcelMedia::update(LLParcel* parcel) std::string mediaUrl = std::string ( parcel->getMediaURL () ); if (!mediaUrl.empty ()) { - if (gSavedSettings.getWarning("QuickTimeInstalled")) + if (gWarningSettings.getBOOL("QuickTimeInstalled")) { - gSavedSettings.setWarning("QuickTimeInstalled", FALSE); + gWarningSettings.setBOOL("QuickTimeInstalled", FALSE); LLNotifications::instance().add("NoQuickTime" ); }; @@ -395,7 +395,7 @@ bool callback_play_media(const LLSD& notification, const LLSD& response, LLParce { gSavedSettings.setBOOL("AudioStreamingVideo", FALSE); } - gSavedSettings.setWarning("FirstStreamingVideo", FALSE); + gWarningSettings.setBOOL("FirstStreamingVideo", FALSE); return false; } |