diff -r 60058126a6d3 doc/contributions.txt
--- a/doc/contributions.txt	Tue Oct 11 09:31:09 2011 -0400
+++ b/doc/contributions.txt	Tue Oct 11 18:16:50 2011 -0400
@@ -576,6 +576,7 @@
 	STORM-1567
 	STORM-1572
 	STORM-1574
+	STORM-976
 Kadah Coba
     STORM-1060
 Jondan Lundquist
diff -r 60058126a6d3 indra/newview/llviewermessage.cpp
--- a/indra/newview/llviewermessage.cpp	Tue Oct 11 09:31:09 2011 -0400
+++ b/indra/newview/llviewermessage.cpp	Tue Oct 11 18:16:50 2011 -0400
@@ -1809,8 +1809,11 @@
 
 void inventory_offer_handler(LLOfferInfo* info)
 {
-	//If muted, don't even go through the messaging stuff.  Just curtail the offer here.
-	if (LLMuteList::getInstance()->isMuted(info->mFromID, info->mFromName))
+	// If muted, don't even go through the messaging stuff.  Just curtail the offer here.
+	// Passing in a null UUID handles the case of where you have muted one of your own objects by_name.
+	// The solution for STORM-1297 seems to handle the cases where the object is owned by someone else.
+	if (LLMuteList::getInstance()->isMuted(info->mFromID, info->mFromName) ||
+		LLMuteList::getInstance()->isMuted(LLUUID::null, info->mFromName))
 	{
 		info->forceResponse(IOR_MUTE);
 		return;