livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-35770 Sounds added to the blacklist keep playing 

Partially reverts commit 9798fae3d2 pending improvements to the check
master
PanteraPolnocy 2025-10-04 18:41:21 +02:00
parent 052d49786a
commit 2ee66d2b6f
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llviewerobject.cpp
View File

@ -6587,6 +6587,24 @@ void LLViewerObject::setAttachedSound(const LLUUID &audio_uuid, const LLUUID& ow
return; return;
} }
// <FS:Ansariel> Asset blacklist
FSAssetBlacklist& blacklist = FSAssetBlacklist::instance();
if (blacklist.isBlacklisted(audio_uuid, LLAssetType::AT_SOUND))
{
return;
}
else if (isAttachment() && blacklist.isBlacklisted(owner_id, LLAssetType::AT_SOUND, FSAssetBlacklist::eBlacklistFlag::WORN))
{
// Attachment sound
return;
}
else if (blacklist.isBlacklisted(owner_id, LLAssetType::AT_SOUND, FSAssetBlacklist::eBlacklistFlag::REZZED))
{
// Rezzed object sound
return;
}
// </FS:Ansariel>
if (flags & LL_SOUND_FLAG_LOOP if (flags & LL_SOUND_FLAG_LOOP
&& mAudioSourcep && mAudioSourcep->isLoop() && mAudioSourcep->getCurrentData() && mAudioSourcep && mAudioSourcep->isLoop() && mAudioSourcep->getCurrentData()
&& mAudioSourcep->getCurrentData()->getID() == audio_uuid) && mAudioSourcep->getCurrentData()->getID() == audio_uuid)