From 1b68f71348ecf3983b76b40d7940da8377f049b7 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Mon, 29 Apr 2024 07:43:28 +0300 Subject: #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed --- indra/newview/llfloatergroups.cpp | 406 +++++++++++++++++++------------------- 1 file changed, 203 insertions(+), 203 deletions(-) (limited to 'indra/newview/llfloatergroups.cpp') diff --git a/indra/newview/llfloatergroups.cpp b/indra/newview/llfloatergroups.cpp index f341e2ebcb..0444927d07 100644 --- a/indra/newview/llfloatergroups.cpp +++ b/indra/newview/llfloatergroups.cpp @@ -1,25 +1,25 @@ -/** +/** * @file llfloatergroups.cpp * @brief LLPanelGroups class implementation * * $LicenseInfo:firstyear=2002&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2010, Linden Research, Inc. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; * version 2.1 of the License only. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -27,7 +27,7 @@ /* * Shown from Edit -> Groups... * Shows the agent's groups and allows the edit window to be invoked. - * Also overloaded to allow picking of a single group for assigning + * Also overloaded to allow picking of a single group for assigning * objects and land to groups. */ @@ -57,11 +57,11 @@ void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 pow ///---------------------------------------------------------------------------- LLFloaterGroupPicker::LLFloaterGroupPicker(const LLSD& seed) -: LLFloater(seed), - mPowersMask(GP_ALL_POWERS), - mID(seed.asUUID()) +: LLFloater(seed), + mPowersMask(GP_ALL_POWERS), + mID(seed.asUUID()) { -// LLUICtrlFactory::getInstance()->buildFloater(this, "floater_choose_group.xml"); +// LLUICtrlFactory::getInstance()->buildFloater(this, "floater_choose_group.xml"); } LLFloaterGroupPicker::~LLFloaterGroupPicker() @@ -70,70 +70,70 @@ LLFloaterGroupPicker::~LLFloaterGroupPicker() void LLFloaterGroupPicker::setPowersMask(U64 powers_mask) { - mPowersMask = powers_mask; - init_group_list(getChild("group list"), gAgent.getGroupID(), mPowersMask); + mPowersMask = powers_mask; + init_group_list(getChild("group list"), gAgent.getGroupID(), mPowersMask); } BOOL LLFloaterGroupPicker::postBuild() { - LLScrollListCtrl* list_ctrl = getChild("group list"); - if (list_ctrl) - { - init_group_list(list_ctrl, gAgent.getGroupID(), mPowersMask); - list_ctrl->setDoubleClickCallback(onBtnOK, this); - list_ctrl->setContextMenu(LLScrollListCtrl::MENU_GROUP); - } - - childSetAction("OK", onBtnOK, this); + LLScrollListCtrl* list_ctrl = getChild("group list"); + if (list_ctrl) + { + init_group_list(list_ctrl, gAgent.getGroupID(), mPowersMask); + list_ctrl->setDoubleClickCallback(onBtnOK, this); + list_ctrl->setContextMenu(LLScrollListCtrl::MENU_GROUP); + } + + childSetAction("OK", onBtnOK, this); - childSetAction("Cancel", onBtnCancel, this); + childSetAction("Cancel", onBtnCancel, this); - setDefaultBtn("OK"); + setDefaultBtn("OK"); - getChildView("OK")->setEnabled(TRUE); + getChildView("OK")->setEnabled(TRUE); - return TRUE; + return TRUE; } void LLFloaterGroupPicker::removeNoneOption() { - // Remove group "none" from list. Group "none" is added in init_group_list(). - // Some UI elements use group "none", we need to manually delete it here. - // Group "none" ID is LLUUID:null. - LLCtrlListInterface* group_list = getChild("group list")->getListInterface(); - if(group_list) - { - group_list->selectByValue(LLUUID::null); - group_list->operateOnSelection(LLCtrlListInterface::OP_DELETE); - } + // Remove group "none" from list. Group "none" is added in init_group_list(). + // Some UI elements use group "none", we need to manually delete it here. + // Group "none" ID is LLUUID:null. + LLCtrlListInterface* group_list = getChild("group list")->getListInterface(); + if(group_list) + { + group_list->selectByValue(LLUUID::null); + group_list->operateOnSelection(LLCtrlListInterface::OP_DELETE); + } } void LLFloaterGroupPicker::onBtnOK(void* userdata) { - LLFloaterGroupPicker* self = (LLFloaterGroupPicker*)userdata; - if(self) self->ok(); + LLFloaterGroupPicker* self = (LLFloaterGroupPicker*)userdata; + if(self) self->ok(); } void LLFloaterGroupPicker::onBtnCancel(void* userdata) { - LLFloaterGroupPicker* self = (LLFloaterGroupPicker*)userdata; - if(self) self->closeFloater(); + LLFloaterGroupPicker* self = (LLFloaterGroupPicker*)userdata; + if(self) self->closeFloater(); } void LLFloaterGroupPicker::ok() { - LLCtrlListInterface *group_list = childGetListInterface("group list"); - LLUUID group_id; - if (group_list) - { - group_id = group_list->getCurrentID(); - } - mGroupSelectSignal(group_id); - - closeFloater(); + LLCtrlListInterface *group_list = childGetListInterface("group list"); + LLUUID group_id; + if (group_list) + { + group_id = group_list->getCurrentID(); + } + mGroupSelectSignal(group_id); + + closeFloater(); } ///---------------------------------------------------------------------------- @@ -144,252 +144,252 @@ void LLFloaterGroupPicker::ok() //virtual bool LLPanelGroups::handleEvent(LLPointer event, const LLSD& userdata) { - if (event->desc() == "new group") - { - reset(); - return true; - } - return false; + if (event->desc() == "new group") + { + reset(); + return true; + } + return false; } // Default constructor LLPanelGroups::LLPanelGroups() : - LLPanel() + LLPanel() { - gAgent.addListener(this, "new group"); + gAgent.addListener(this, "new group"); } LLPanelGroups::~LLPanelGroups() { - gAgent.removeListener(this); + gAgent.removeListener(this); } // clear the group list, and get a fresh set of info. void LLPanelGroups::reset() { - LLCtrlListInterface *group_list = childGetListInterface("group list"); - if (group_list) - { - group_list->operateOnAll(LLCtrlListInterface::OP_DELETE); - } - getChild("groupcount")->setTextArg("[COUNT]", llformat("%d",gAgent.mGroups.size())); - getChild("groupcount")->setTextArg("[MAX]", llformat("%d",LLAgentBenefitsMgr::current().getGroupMembershipLimit())); - - init_group_list(getChild("group list"), gAgent.getGroupID()); - enableButtons(); + LLCtrlListInterface *group_list = childGetListInterface("group list"); + if (group_list) + { + group_list->operateOnAll(LLCtrlListInterface::OP_DELETE); + } + getChild("groupcount")->setTextArg("[COUNT]", llformat("%d",gAgent.mGroups.size())); + getChild("groupcount")->setTextArg("[MAX]", llformat("%d",LLAgentBenefitsMgr::current().getGroupMembershipLimit())); + + init_group_list(getChild("group list"), gAgent.getGroupID()); + enableButtons(); } BOOL LLPanelGroups::postBuild() { - childSetCommitCallback("group list", onGroupList, this); + childSetCommitCallback("group list", onGroupList, this); - getChild("groupcount")->setTextArg("[COUNT]", llformat("%d",gAgent.mGroups.size())); - getChild("groupcount")->setTextArg("[MAX]", llformat("%d",LLAgentBenefitsMgr::current().getGroupMembershipLimit())); + getChild("groupcount")->setTextArg("[COUNT]", llformat("%d",gAgent.mGroups.size())); + getChild("groupcount")->setTextArg("[MAX]", llformat("%d",LLAgentBenefitsMgr::current().getGroupMembershipLimit())); - LLScrollListCtrl *list = getChild("group list"); - if (list) - { - init_group_list(list, gAgent.getGroupID()); - list->setDoubleClickCallback(onBtnIM, this); - list->setContextMenu(LLScrollListCtrl::MENU_GROUP); - } + LLScrollListCtrl *list = getChild("group list"); + if (list) + { + init_group_list(list, gAgent.getGroupID()); + list->setDoubleClickCallback(onBtnIM, this); + list->setContextMenu(LLScrollListCtrl::MENU_GROUP); + } - childSetAction("Activate", onBtnActivate, this); + childSetAction("Activate", onBtnActivate, this); - childSetAction("Info", onBtnInfo, this); + childSetAction("Info", onBtnInfo, this); - childSetAction("IM", onBtnIM, this); + childSetAction("IM", onBtnIM, this); - childSetAction("Leave", onBtnLeave, this); + childSetAction("Leave", onBtnLeave, this); - childSetAction("Create", onBtnCreate, this); + childSetAction("Create", onBtnCreate, this); - childSetAction("Search...", onBtnSearch, this); + childSetAction("Search...", onBtnSearch, this); - setDefaultBtn("IM"); + setDefaultBtn("IM"); - reset(); + reset(); - return TRUE; + return TRUE; } void LLPanelGroups::enableButtons() { - LLCtrlListInterface *group_list = childGetListInterface("group list"); - LLUUID group_id; - if (group_list) - { - group_id = group_list->getCurrentID(); - } - - if(group_id != gAgent.getGroupID()) - { - getChildView("Activate")->setEnabled(TRUE); - } - else - { - getChildView("Activate")->setEnabled(FALSE); - } - if (group_id.notNull()) - { - getChildView("Info")->setEnabled(TRUE); - getChildView("IM")->setEnabled(TRUE); - getChildView("Leave")->setEnabled(TRUE); - } - else - { - getChildView("Info")->setEnabled(FALSE); - getChildView("IM")->setEnabled(FALSE); - getChildView("Leave")->setEnabled(FALSE); - } - getChildView("Create")->setEnabled(gAgent.canJoinGroups()); + LLCtrlListInterface *group_list = childGetListInterface("group list"); + LLUUID group_id; + if (group_list) + { + group_id = group_list->getCurrentID(); + } + + if(group_id != gAgent.getGroupID()) + { + getChildView("Activate")->setEnabled(TRUE); + } + else + { + getChildView("Activate")->setEnabled(FALSE); + } + if (group_id.notNull()) + { + getChildView("Info")->setEnabled(TRUE); + getChildView("IM")->setEnabled(TRUE); + getChildView("Leave")->setEnabled(TRUE); + } + else + { + getChildView("Info")->setEnabled(FALSE); + getChildView("IM")->setEnabled(FALSE); + getChildView("Leave")->setEnabled(FALSE); + } + getChildView("Create")->setEnabled(gAgent.canJoinGroups()); } void LLPanelGroups::onBtnCreate(void* userdata) { - LLPanelGroups* self = (LLPanelGroups*)userdata; - if(self) self->create(); + LLPanelGroups* self = (LLPanelGroups*)userdata; + if(self) self->create(); } void LLPanelGroups::onBtnActivate(void* userdata) { - LLPanelGroups* self = (LLPanelGroups*)userdata; - if(self) self->activate(); + LLPanelGroups* self = (LLPanelGroups*)userdata; + if(self) self->activate(); } void LLPanelGroups::onBtnInfo(void* userdata) { - LLPanelGroups* self = (LLPanelGroups*)userdata; - if(self) self->info(); + LLPanelGroups* self = (LLPanelGroups*)userdata; + if(self) self->info(); } void LLPanelGroups::onBtnIM(void* userdata) { - LLPanelGroups* self = (LLPanelGroups*)userdata; - if(self) self->startIM(); + LLPanelGroups* self = (LLPanelGroups*)userdata; + if(self) self->startIM(); } void LLPanelGroups::onBtnLeave(void* userdata) { - LLPanelGroups* self = (LLPanelGroups*)userdata; - if(self) self->leave(); + LLPanelGroups* self = (LLPanelGroups*)userdata; + if(self) self->leave(); } void LLPanelGroups::onBtnSearch(void* userdata) { - LLPanelGroups* self = (LLPanelGroups*)userdata; - if(self) self->search(); + LLPanelGroups* self = (LLPanelGroups*)userdata; + if(self) self->search(); } void LLPanelGroups::create() { - LLGroupActions::createGroup(); + LLGroupActions::createGroup(); } void LLPanelGroups::activate() { - LLCtrlListInterface *group_list = childGetListInterface("group list"); - LLUUID group_id; - if (group_list) - { - group_id = group_list->getCurrentID(); - } - LLGroupActions::activate(group_id); + LLCtrlListInterface *group_list = childGetListInterface("group list"); + LLUUID group_id; + if (group_list) + { + group_id = group_list->getCurrentID(); + } + LLGroupActions::activate(group_id); } void LLPanelGroups::info() { - LLCtrlListInterface *group_list = childGetListInterface("group list"); - LLUUID group_id; - if (group_list && (group_id = group_list->getCurrentID()).notNull()) - { - LLGroupActions::show(group_id); - } + LLCtrlListInterface *group_list = childGetListInterface("group list"); + LLUUID group_id; + if (group_list && (group_id = group_list->getCurrentID()).notNull()) + { + LLGroupActions::show(group_id); + } } void LLPanelGroups::startIM() { - LLCtrlListInterface *group_list = childGetListInterface("group list"); - LLUUID group_id; + LLCtrlListInterface *group_list = childGetListInterface("group list"); + LLUUID group_id; - if (group_list && (group_id = group_list->getCurrentID()).notNull()) - { - LLGroupActions::startIM(group_id); - } + if (group_list && (group_id = group_list->getCurrentID()).notNull()) + { + LLGroupActions::startIM(group_id); + } } void LLPanelGroups::leave() { - LLCtrlListInterface *group_list = childGetListInterface("group list"); - LLUUID group_id; - if (group_list && (group_id = group_list->getCurrentID()).notNull()) - { - LLGroupActions::leave(group_id); - } + LLCtrlListInterface *group_list = childGetListInterface("group list"); + LLUUID group_id; + if (group_list && (group_id = group_list->getCurrentID()).notNull()) + { + LLGroupActions::leave(group_id); + } } void LLPanelGroups::search() { - LLGroupActions::search(); + LLGroupActions::search(); } void LLPanelGroups::onGroupList(LLUICtrl* ctrl, void* userdata) { - LLPanelGroups* self = (LLPanelGroups*)userdata; - if(self) self->enableButtons(); + LLPanelGroups* self = (LLPanelGroups*)userdata; + if(self) self->enableButtons(); } void init_group_list(LLScrollListCtrl* group_list, const LLUUID& highlight_id, U64 powers_mask) { - S32 count = gAgent.mGroups.size(); - LLUUID id; - if (!group_list) return; - - group_list->operateOnAll(LLCtrlListInterface::OP_DELETE); - - for(S32 i = 0; i < count; ++i) - { - id = gAgent.mGroups.at(i).mID; - LLGroupData* group_datap = &gAgent.mGroups.at(i); - if ((powers_mask == GP_ALL_POWERS) || ((group_datap->mPowers & powers_mask) != 0)) - { - std::string style = "NORMAL"; - if(highlight_id == id) - { - style = "BOLD"; - } - - LLSD element; - element["id"] = id; - element["columns"][0]["column"] = "name"; - element["columns"][0]["value"] = group_datap->mName; - element["columns"][0]["font"]["name"] = "SANSSERIF"; - element["columns"][0]["font"]["style"] = style; - - group_list->addElement(element); - } - } - - group_list->sortOnce(0, TRUE); - - // add "none" to list at top - { - std::string style = "NORMAL"; - if (highlight_id.isNull()) - { - style = "BOLD"; - } - LLSD element; - element["id"] = LLUUID::null; - element["columns"][0]["column"] = "name"; - element["columns"][0]["value"] = LLTrans::getString("GroupsNone"); - element["columns"][0]["font"]["name"] = "SANSSERIF"; - element["columns"][0]["font"]["style"] = style; - - group_list->addElement(element, ADD_TOP); - } - - group_list->selectByValue(highlight_id); + S32 count = gAgent.mGroups.size(); + LLUUID id; + if (!group_list) return; + + group_list->operateOnAll(LLCtrlListInterface::OP_DELETE); + + for(S32 i = 0; i < count; ++i) + { + id = gAgent.mGroups.at(i).mID; + LLGroupData* group_datap = &gAgent.mGroups.at(i); + if ((powers_mask == GP_ALL_POWERS) || ((group_datap->mPowers & powers_mask) != 0)) + { + std::string style = "NORMAL"; + if(highlight_id == id) + { + style = "BOLD"; + } + + LLSD element; + element["id"] = id; + element["columns"][0]["column"] = "name"; + element["columns"][0]["value"] = group_datap->mName; + element["columns"][0]["font"]["name"] = "SANSSERIF"; + element["columns"][0]["font"]["style"] = style; + + group_list->addElement(element); + } + } + + group_list->sortOnce(0, TRUE); + + // add "none" to list at top + { + std::string style = "NORMAL"; + if (highlight_id.isNull()) + { + style = "BOLD"; + } + LLSD element; + element["id"] = LLUUID::null; + element["columns"][0]["column"] = "name"; + element["columns"][0]["value"] = LLTrans::getString("GroupsNone"); + element["columns"][0]["font"]["name"] = "SANSSERIF"; + element["columns"][0]["font"]["style"] = style; + + group_list->addElement(element, ADD_TOP); + } + + group_list->selectByValue(highlight_id); } -- cgit v1.2.3