From f2568ce152e71070f1ca35f08d5bb64cac16ffeb Mon Sep 17 00:00:00 2001
From: Rohacan Hirons <rohacan.hirons@outlook.fr>
Date: Tue, 17 Jun 2025 01:13:10 +0200
Subject: [PATCH] Fixed issue where blacklist check was not applied to objects

---
 indra/newview/llviewerobject.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 9cc99b53d2..e618a0485d 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -6597,9 +6597,20 @@ void LLViewerObject::setAttachedSound(const LLUUID &audio_uuid, const LLUUID& ow
     }
 
     // <FS:Ansariel> Asset blacklist
-    if (FSAssetBlacklist::getInstance()->isBlacklisted(audio_uuid, LLAssetType::AT_SOUND))
+    FSAssetBlacklist& blacklist = FSAssetBlacklist::instance();
+    if (blacklist.isBlacklisted(sound_id, LLAssetType::AT_SOUND))
     {
-        return;
+        return true;
+    }
+    else if (isAttachment() && blacklist.isBlacklisted(owner_id, LLAssetType::AT_SOUND, FSAssetBlacklist::eBlacklistFlag::WORN))
+    {
+        // Attachment sound
+        return true;
+    }
+    else if (blacklist.isBlacklisted(owner_id, LLAssetType::AT_SOUND, FSAssetBlacklist::eBlacklistFlag::REZZED))
+    {
+        // Rezzed object sound
+        return true;
     }
     // </FS:Ansariel>