diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-02-09 13:47:13 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-09 13:47:13 -0800 |
| commit | 3aa7e1b0c10fcb660cfc13308dd2a45223696e11 (patch) | |
| tree | 6ca14e85d336043b434fc1b9333a2c349d2c6220 /indra/newview/llviewermedia.cpp | |
| parent | cf09a48bb21d553c837186cc2e7198801f06691a (diff) | |
PARTIAL EXT-5261: add new "MediaTentativeAutoPlay" setting
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index e77106bb2c..3063341ade 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -2663,7 +2663,9 @@ void LLViewerMediaImpl::setTextureID(LLUUID id) // bool LLViewerMediaImpl::isAutoPlayable() const { - return (mMediaAutoPlay && gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING)); + return (mMediaAutoPlay && + gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING) && + gSavedSettings.getBOOL("MediaTentativeAutoPlay")); } ////////////////////////////////////////////////////////////////////////////////////////// |