diff options
| author | skolb <none@none> | 2009-10-23 15:29:00 -0700 |
|---|---|---|
| committer | skolb <none@none> | 2009-10-23 15:29:00 -0700 |
| commit | 913786a62b2b8d8e6d9c483ea805a21e694fd818 (patch) | |
| tree | c7a2b1f7bcffe7262f549b062493908e03674446 /indra/newview/llviewermedia.cpp | |
| parent | 2438a9168b117dcabf5e5819f93e08a874735a26 (diff) | |
DEV-41787 Media Auto Play controls were removed from prefs. Also made auto play override prim settings.
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; } |