summaryrefslogtreecommitdiff
path: root/indra/newview/llavataractions.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-07-01 09:41:10 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-07-01 09:41:10 -0400
commit4bce553a96dc6d75279f2c2b35fb8060a3f6bae1 (patch)
tree70c1b0c2b43f2649777eb8cac7eb927906034640 /indra/newview/llavataractions.cpp
parenta1fb8ae0d0679499a68fb8dd1965ab5026878c73 (diff)
parent662a92784328f31b680f4f049350dd0f6cacf4c7 (diff)
merge viewer-development -> mesh-development
Diffstat (limited to 'indra/newview/llavataractions.cpp')
-rwxr-xr-xindra/newview/llavataractions.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index cbbdcb2983..955f19c82c 100755
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -773,6 +773,10 @@ bool LLAvatarActions::canOfferTeleport(const LLUUID& id)
// static
bool LLAvatarActions::canOfferTeleport(const uuid_vec_t& ids)
{
+ // We can't send more than 250 lures in a single message, so disable this
+ // button when there are too many id's selected.
+ if(ids.size() > 250) return false;
+
bool result = true;
for (uuid_vec_t::const_iterator it = ids.begin(); it != ids.end(); ++it)
{