From b7edebf2725582dbd71b188fb8fd954250a2d928 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Wed, 13 Jul 2016 23:44:58 -0400 Subject: [PATCH] Conserve messages when right-click bulk kicking. --- indra/newview/llviewermenu.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index b7176c42d..a6e6da211 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -9191,16 +9191,21 @@ void estate_bulk_eject(const uuid_vec_t& ids, bool ban, S32 option) { if (ids.empty() || option == (ban ? 1 : 2)) return; const bool tphome(option == 1); - const std::string request(tphome ? "teleporthomeuser" : "kickestate"); const std::string agent(tphome ? gAgentID.asString() : LLStringUtil::null); + std::vector strings; + if (!tphome) strings.reserve(ids.size()); for (const LLUUID& id : ids) { if (id.isNull()) continue; const std::string idstr(id.asString()); - send_estate_message(request, tphome ? std::vector({agent, idstr}) : std::vector({idstr})); + if (tphome) + send_estate_message("teleporthomeuser", {agent, idstr}); + else + strings.push_back(idstr); if (ban) LLPanelEstateInfo::sendEstateAccessDelta(ESTATE_ACCESS_BANNED_AGENT_ADD | ESTATE_ACCESS_ALLOWED_AGENT_REMOVE | ESTATE_ACCESS_NO_REPLY, id); } + if (!tphome) send_estate_message("kickestate", strings); } class ListEstateBan : public view_listener_t