diff options
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 10 |
2 files changed, 8 insertions, 3 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index d33c448416..397311373e 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -443,6 +443,7 @@ Jonathan Yap STORM-1236 STORM-1259 STORM-787 + STORM-1313 STORM-899 STORM-1273 Kage Pixel 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)) { |