Permalink
Browse files

Conserve messages when right-click bulk kicking.

  • Loading branch information...
1 parent dd74e69 commit b7edebf2725582dbd71b188fb8fd954250a2d928 @Lirusaito Lirusaito committed Jul 14, 2016
Showing with 7 additions and 2 deletions.
  1. +7 −2 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<std::string> 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<std::string>({agent, idstr}) : std::vector<std::string>({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

0 comments on commit b7edebf

Please sign in to comment.