summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2011-06-15 09:25:40 -0700
committerAndrew A. de Laix <alain@lindenlab.com>2011-06-15 09:25:40 -0700
commit92a47165be54de4dd6bf42bc9472d2fc54f7169e (patch)
tree8eeeae9135a4e6946cc1ea6fabc51114481fee0a /indra/newview/llviewermessage.cpp
parent735c0dbc5ff731aad95227a940ef8b09a4a9e77d (diff)
parent6f1fabf0e09662a2d0467fcc487ff6189fc5133c (diff)
Automated merge with https://bitbucket.org/alain_linden/viewer-development
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r--indra/newview/llviewermessage.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 3832be727f..435b2e063d 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -6266,6 +6266,15 @@ void send_group_notice(const LLUUID& group_id,
bool handle_lure_callback(const LLSD& notification, const LLSD& response)
{
+ if(notification["payload"]["ids"].size() > 250)
+ {
+ // More than 250 targets will overload the message.
+ LLSD args;
+ args["OFFERS"] = notification["payload"]["ids"].size();
+ LLNotificationsUtil::add("TooManyTeleportOffers", args);
+ return false;
+ }
+
std::string text = response["message"].asString();
LLSLURL slurl;
LLAgentUI::buildSLURL(slurl);