diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-07-03 21:25:03 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-07-03 21:25:03 +0800 |
| commit | 9dee269eacd32c48627d3fcc243104a56f021bbc (patch) | |
| tree | b6418c111051e1ccebf0553e7ff667f917ea4c8d /indra/newview/llvovolume.cpp | |
| parent | fa7a4a38d8e66121116d91d947c4ec807822912e (diff) | |
| parent | bca9ba9b7940f9e32fe9dd25fb64fa4f2fb407db (diff) | |
Merge tag 'Second_Life_Project#bca9ba9b-glTF_Mesh_Import' into gltf_mesh_import
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index d0bdcf132f..78e2257e56 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -2643,6 +2643,17 @@ void LLVOVolume::syncMediaData(S32 texture_index, const LLSD &media_data, bool m } viewer_media_t media_impl = LLViewerMedia::getInstance()->updateMediaImpl(mep, previous_url, update_from_self); + static LLCachedControl<bool> media_autoplay_huds(gSavedSettings, "MediaAutoPlayHuds", true); + bool was_loaded = media_impl->hasMedia(); + if (isHUDAttachment() && media_autoplay_huds && !was_loaded) + { + std::string url = mep->getCurrentURL(); + if (media_impl->getCurrentMediaURL() != url) + { + media_impl->navigateTo(url, "", false, true); + } + } + addMediaImpl(media_impl, texture_index) ; } else |