livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for storm-956

meow-7.2.2
Oz Linden 2011-05-02 07:19:07 -04:00
parent 37084d7edb 04f79f6358
commit 5a280f320e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/contributions.txt
View File

@ -424,6 +424,7 @@ Jonathan Yap
STORM-1094
STORM-1077
STORM-953
STORM-956
STORM-1095
Kage Pixel
VWR-11
@ -799,6 +800,7 @@ Thickbrick Sleaford
VWR-13483
VWR-13947
VWR-24420
STORM-956
STORM-1147
Thraxis Epsilon
SVC-371

7
indra/newview/llviewermessage.cpp
View File

@ -6465,9 +6465,12 @@ void process_script_dialog(LLMessageSystem* msg, void**)
LLSD payload;
LLUUID object_id;
msg->getUUID("Data", "ObjectID", object_id);
LLUUID owner_id;
if (LLMuteList::getInstance()->isMuted(object_id))
msg->getUUID("Data", "ObjectID", object_id);
msg->getUUID("OwnerData", "OwnerID", owner_id);
if (LLMuteList::getInstance()->isMuted(object_id) || LLMuteList::getInstance()->isMuted(owner_id))
{
return;
}