diff options
| author | James Cook <james@lindenlab.com> | 2009-10-23 16:44:23 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-10-23 16:44:23 -0700 |
| commit | 07f7247dff19cb7acd320113734773c099b0366d (patch) | |
| tree | 7072f301675db427686c06eca48592b89d4db227 /indra/newview/llviewermedia.cpp | |
| parent | 71822edfe824c5f7c742d6d9b8528f8ff541963b (diff) | |
| parent | 2b69cb9e9cf5209a8156580b74e6662e4cc4243f (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 5967b68e51..0b6ac0e2e2 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -250,7 +250,7 @@ viewer_media_t LLViewerMedia::updateMediaImpl(LLMediaEntry* media_entry, const s media_impl->mMediaSource->setSize(media_entry->getWidthPixels(), media_entry->getHeightPixels()); } - if((was_loaded || media_entry->getAutoPlay()) && !update_from_self) + if((was_loaded || (media_entry->getAutoPlay() && gSavedSettings.getBOOL("AutoPlayMedia"))) && !update_from_self) { if(!media_entry->getCurrentURL().empty()) { @@ -273,7 +273,7 @@ viewer_media_t LLViewerMedia::updateMediaImpl(LLMediaEntry* media_entry, const s media_impl->setHomeURL(media_entry->getHomeURL()); - if(media_entry->getAutoPlay()) + if(media_entry->getAutoPlay() && gSavedSettings.getBOOL("AutoPlayMedia")) { needs_navigate = true; } |