diff -r ec4ad7e3ecca -r ec3066317a25 doc/contributions.txt --- a/doc/contributions.txt Thu Feb 10 11:56:06 2011 -0800 +++ b/doc/contributions.txt Wed Apr 20 14:27:42 2011 -0400 @@ -398,6 +398,7 @@ STORM-643 STORM-960 STORM-953 + STORM-956 Kage Pixel VWR-11 Ken March @@ -762,6 +763,7 @@ VWR-13483 VWR-13947 VWR-24420 + STORM-956 Thraxis Epsilon SVC-371 VWR-383 diff -r ec4ad7e3ecca -r ec3066317a25 indra/newview/llviewermessage.cpp --- a/indra/newview/llviewermessage.cpp Thu Feb 10 11:56:06 2011 -0800 +++ b/indra/newview/llviewermessage.cpp Wed Apr 20 14:27:42 2011 -0400 @@ -6462,9 +6462,12 @@ LLSD payload; LLUUID object_id; + LLUUID owner_id; + msg->getUUID("Data", "ObjectID", object_id); - - if (LLMuteList::getInstance()->isMuted(object_id)) + msg->getUUID("OwnerData", "OwnerID", owner_id); + + if (LLMuteList::getInstance()->isMuted(object_id) || LLMuteList::getInstance()->isMuted(owner_id)) { return; } diff -r ec4ad7e3ecca -r ec3066317a25 scripts/messages/message_template.msg --- a/scripts/messages/message_template.msg Thu Feb 10 11:56:06 2011 -0800 +++ b/scripts/messages/message_template.msg Wed Apr 20 14:27:42 2011 -0400 @@ -2966,7 +2966,7 @@ { BillableFactor F32 } { ObjectBonusFactor F32 } { WaterHeight F32 } - { TerrainRaiseLimit F32 } + { TerrainRaiseLimit F32 } { TerrainLowerLimit F32 } { PricePerMeter S32 } { RedirectGridX S32 } @@ -4242,6 +4242,10 @@ Buttons Variable { ButtonLabel Variable 1 } } + { + OwnerData Variable + { OwnerID LLUUID } + } } @@ -6762,6 +6766,8 @@ } // 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 {