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

merge changes for storm-1313

meow-7.2.2
Oz Linden 2011-06-15 11:58:01 -04:00
parent 81afbd5b29 cc7a041bfe
commit 26e1f92c83
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -443,6 +443,7 @@ Jonathan Yap
STORM-1236
STORM-1259
STORM-787
STORM-1313
STORM-899
STORM-1273
Kage Pixel

10
indra/newview/llviewermessage.cpp
View File

@ -6486,10 +6486,14 @@ 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);
// For compability with OS grids first check for presence of extended packet before fetching data.
LLUUID owner_id;
if (gMessageSystem->getNumberOfBlocks("OwnerData") > 0)
{
msg->getUUID("OwnerData", "OwnerID", owner_id);
}
if (LLMuteList::getInstance()->isMuted(object_id) || LLMuteList::getInstance()->isMuted(owner_id))
{