2 files changed, 20 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 07701d5..d7122fd 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
 2009-10-08 McCabe Maxsted  <hakushakukun@gmail.com>
 
+        * Don't show lldialog boxes from muted avatars anymore.
+        
+          modified:   linden/indra/newview/llviewermessage.cpp
+          
+          
         * Fixed money change notification happening after logout/login.
         
           modified:   linden/indra/newview/llviewermessage.cpp
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 88f6b36..f460996 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -5470,6 +5470,21 @@ void process_script_dialog(LLMessageSystem* msg, void**)
         msg->getString("Data", "Message", message);
         msg->getS32("Data", "ChatChannel", info->mChatChannel);
 
+        // Don't show lldialog boxes from muted avs -- McCabe
+        if (!first_name.empty())
+        {
+                std::string agent_name = first_name + " " + last_name;
+                std::vector<LLMute> mutes = LLMuteList::getInstance()->getMutes();
+                for (U32 i = 0; i < mutes.size(); i++)
+                {
+                        if (mutes[i].mName == agent_name)
+                        {
+                                delete info;
+                                return;
+                        }
+                }
+        }
+
                 // unused for now
         LLUUID image_id;
         msg->getUUID("Data", "ImageID", image_id);