diff --git a/doc/contributions.txt b/doc/contributions.txt
index 516760aa5a6ee15e4c97dee6a06ada3d5d4a4456..51235e0ce51421894c9117743ff23ddce1ff9b12 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -398,6 +398,7 @@ Jonathan Yap
 	STORM-643
 	STORM-960
 	STORM-953
+	STORM-956
 Kage Pixel
 	VWR-11
 Ken March
@@ -762,6 +763,7 @@ Thickbrick Sleaford
 	VWR-13483
 	VWR-13947
 	VWR-24420
+	STORM-956
 Thraxis Epsilon
 	SVC-371
 	VWR-383
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 103989ee808db75cee7e0b0c7db5d61ad45443b9..0da60ed4ab0a9c9291795ed6b52b30f86b2aa057 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -6462,9 +6462,12 @@ void process_script_dialog(LLMessageSystem* msg, void**)
 	LLSD payload;
 
 	LLUUID object_id;
+    LLUUID owner_id;
+
 	msg->getUUID("Data", "ObjectID", object_id);
+    msg->getUUID("OwnerData", "OwnerID", owner_id);
 
-	if (LLMuteList::getInstance()->isMuted(object_id))
+	if (LLMuteList::getInstance()->isMuted(object_id) || LLMuteList::getInstance()->isMuted(owner_id))
 	{
 		return;
 	}
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 77dc940335cd13bad1a72b4ef61500cfebacf8ae..d292653d3f3a3356f90047628891f0ef30ea922e 100644
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -2966,7 +2966,7 @@ version 2.0
 		{	BillableFactor		F32			}
 		{	ObjectBonusFactor 	F32			}
 		{	WaterHeight			F32			}
-		{   TerrainRaiseLimit	F32 		}
+		{	TerrainRaiseLimit	F32 		}
 		{	TerrainLowerLimit	F32 		}
 		{	PricePerMeter 		S32			}
 		{	RedirectGridX 		S32			}
@@ -4242,6 +4242,10 @@ version 2.0
 		Buttons	Variable
 		{	ButtonLabel		Variable	1	}
 	}
+	{
+		OwnerData Variable
+		{	OwnerID		LLUUID	}
+	}
 }
 
 
@@ -6762,6 +6766,8 @@ version 2.0
 }
 
 // And, the money transfer
+// *NOTE: Unused as of 2010-04-06, because all back-end money transactions
+// are done with web services via L$ API.  JC
 {
 	MoneyTransferBackend Low 312 Trusted Zerocoded
 	{