Skip to content
Snippets Groups Projects
Commit ad1a46af authored by Callum Prentice's avatar Callum Prentice
Browse files

Fix (has a TOOD) for SL-13203: Parcel media auto-play works when turned off

parent 839e7acb
No related branches found
No related tags found
No related merge requests found
...@@ -159,6 +159,12 @@ void LLViewerParcelMedia::play(LLParcel* parcel) ...@@ -159,6 +159,12 @@ void LLViewerParcelMedia::play(LLParcel* parcel)
if (!gSavedSettings.getBOOL("AudioStreamingMedia")) if (!gSavedSettings.getBOOL("AudioStreamingMedia"))
return; return;
// This test appears all over the code and really should be facotred out into a single
// call that returns true/false (with option ask dialog) but that is outside of scope
// for this work so we'll just directly.
if (gSavedSettings.getS32("ParcelMediaAutoPlayEnable") == 0 )
return;
std::string media_url = parcel->getMediaURL(); std::string media_url = parcel->getMediaURL();
std::string media_current_url = parcel->getMediaCurrentURL(); std::string media_current_url = parcel->getMediaCurrentURL();
std::string mime_type = parcel->getMediaType(); std::string mime_type = parcel->getMediaType();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment