From cc7a041bfe908faa1a256d13d35cb1ad17358f60 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Fri, 3 Jun 2011 14:41:08 -0400
Subject: [PATCH] Fix for Storm-956 crashes viewer when connected to non-LL
grids
---
doc/contributions.txt | 1 +
indra/newview/llviewermessage.cpp | 10 +++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index dfbccb5a6c9..94c73a2f52b 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -440,6 +440,7 @@ Jonathan Yap
STORM-1095
STORM-1236
STORM-1259
+ STORM-1313
Kage Pixel
VWR-11
Ken March
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 3832be727fc..49188e46c62 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -6483,10 +6483,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))
{
--
GitLab