diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 19:28:15 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 19:28:15 +0300 |
| commit | 85f2447b3ddf7e4b91cd5963cb2e7668d48ab2a9 (patch) | |
| tree | 494487bbc57c79d17921b7443003d2a118e24ddb /indra/llaudio | |
| parent | 398369233fc2621eb447701e26082057fb0c97d7 (diff) | |
| parent | d98fc504a1d4bc292ba86acdda053c8b4598a193 (diff) | |
Merge branch 'main' into marchcat/a-merge
# Conflicts:
# autobuild.xml
# indra/llimage/llimage.cpp
# indra/llui/llsearcheditor.cpp
# indra/llui/llview.cpp
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloatercamera.cpp
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelgroupbulkban.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/llvovolume.cpp
Diffstat (limited to 'indra/llaudio')
| -rw-r--r-- | indra/llaudio/llaudioengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp index a387bb23cd..ece0a12a7a 100644 --- a/indra/llaudio/llaudioengine.cpp +++ b/indra/llaudio/llaudioengine.cpp @@ -398,7 +398,7 @@ void LLAudioEngine::idle() for (source_map::value_type& src_pair : mAllSources) { LLAudioSource *sourcep = src_pair.second; - if (sourcep->isMuted() && sourcep->isSyncMaster() && sourcep->getPriority() > max_sm_priority) + if (!sourcep->isMuted() && sourcep->isSyncMaster() && sourcep->getPriority() > max_sm_priority) { sync_masterp = sourcep; master_channelp = sync_masterp->getChannel(); |