diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-15 11:58:01 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-15 11:58:01 -0400 |
| commit | 26e1f92c831c35ca0761c385d0540331d26f9a50 (patch) | |
| tree | 7701123a8288e122af6956eb06ea6da4ed1d3446 /indra | |
| parent | 81afbd5b293e80248daddb51e7985e474abe9d45 (diff) | |
| parent | cc7a041bfe908faa1a256d13d35cb1ad17358f60 (diff) | |
merge changes for storm-1313
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 0aada644f3..01a5cb18db 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -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)) { |