Skip to content
Snippets Groups Projects
Commit de11ebef authored by Richard Linden's avatar Richard Linden
Browse files

EXP-359 WIP Disable MOAP

fixed AudioStreamingMusic and AudioStreamingMedia so they are independent
this way we can keep audio on but disable html content
parent 7a74e2c0
No related branches found
No related tags found
No related merge requests found
...@@ -1784,8 +1784,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use ...@@ -1784,8 +1784,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
void optionally_start_music(const std::string& music_url) void optionally_start_music(const std::string& music_url)
{ {
if (gSavedSettings.getBOOL("AudioStreamingMusic") && if (gSavedSettings.getBOOL("AudioStreamingMusic"))
gSavedSettings.getBOOL("AudioStreamingMedia"))
{ {
// only play music when you enter a new parcel if the UI control for this // only play music when you enter a new parcel if the UI control for this
// was not *explicitly* stopped by the user. (part of SL-4878) // was not *explicitly* stopped by the user. (part of SL-4878)
......
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