diff options
author | Dave SIMmONs <simon@lindenlab.com> | 2011-06-29 11:36:19 -0700 |
---|---|---|
committer | Dave SIMmONs <simon@lindenlab.com> | 2011-06-29 11:36:19 -0700 |
commit | cc73cf15e6c2a361df278cb0b66c4d68c6acfbcd (patch) | |
tree | 27140b901d74acd106c5fc4c7a96a2e578635347 /indra/newview/llavataractions.cpp | |
parent | 1fbf3e0ec297004879d766cad11c5e9e15b86d4b (diff) | |
parent | a300902494f76b9542c3978c2ca80726cefbc942 (diff) |
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llavataractions.cpp')
-rwxr-xr-x | indra/newview/llavataractions.cpp | 4 |
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) { |