summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2010-03-22 17:04:58 +0200
committerIgor Borovkov <iborovkov@productengine.com>2010-03-22 17:04:58 +0200
commitbcf959f97cbec3f394bd1ca8f07fb742d09b0614 (patch)
tree675deff90aeebab0a4d1eb74765d728d2fac4487 /indra
parent858d1e9ad00db909be54112dbffc1c709dd7ba2e (diff)
fixed EXT-6474 crash in Search Floater, people tab, on offering teleport (when viewer is disconnected, timed out)
added defensive check for non null region --HG-- branch : product-engine
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewermessage.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 5f7b19a5cb..af0af9cd0e 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5511,6 +5511,10 @@ void handle_lure(const LLUUID& invitee)
// Prompt for a message to the invited user.
void handle_lure(const std::vector<LLUUID>& ids)
{
+ if (ids.empty()) return;
+
+ if (!gAgent.getRegion()) return;
+
LLSD edit_args;
edit_args["REGION"] = gAgent.getRegion()->getName();