From a5261a5fa8fad810ecb5c260d92c3e771822bf58 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 20 Feb 2024 23:46:23 +0100 Subject: Convert BOOL to bool in llui --- indra/newview/llfloaterobjectweights.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfloaterobjectweights.cpp') diff --git a/indra/newview/llfloaterobjectweights.cpp b/indra/newview/llfloaterobjectweights.cpp index ed1ad4426f..96e7ae8b98 100644 --- a/indra/newview/llfloaterobjectweights.cpp +++ b/indra/newview/llfloaterobjectweights.cpp @@ -84,7 +84,7 @@ LLFloaterObjectWeights::~LLFloaterObjectWeights() } // virtual -BOOL LLFloaterObjectWeights::postBuild() +bool LLFloaterObjectWeights::postBuild() { mSelectedObjects = getChild("objects"); mSelectedPrims = getChild("prims"); @@ -99,7 +99,7 @@ BOOL LLFloaterObjectWeights::postBuild() mRemainingCapacity = getChild("remaining_capacity"); mTotalCapacity = getChild("total_capacity"); - return TRUE; + return true; } // virtual -- cgit v1.2.3 From e2e37cced861b98de8c1a7c9c0d3a50d2d90e433 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 22 May 2024 21:25:21 +0200 Subject: Fix line endlings --- indra/newview/llfloaterobjectweights.cpp | 548 +++++++++++++++---------------- 1 file changed, 274 insertions(+), 274 deletions(-) (limited to 'indra/newview/llfloaterobjectweights.cpp') diff --git a/indra/newview/llfloaterobjectweights.cpp b/indra/newview/llfloaterobjectweights.cpp index 7f9db8d850..26b7304b9a 100644 --- a/indra/newview/llfloaterobjectweights.cpp +++ b/indra/newview/llfloaterobjectweights.cpp @@ -1,274 +1,274 @@ -/** - * @file llfloaterobjectweights.cpp - * @brief Object weights advanced view floater - * - * $LicenseInfo:firstyear=2011&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2011, 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$ - */ -#include "llviewerprecompiledheaders.h" - -#include "llfloaterobjectweights.h" - -#include "llparcel.h" - -#include "llfloaterreg.h" -#include "lltextbox.h" - -#include "llagent.h" -#include "llviewerparcelmgr.h" -#include "llviewerregion.h" - -// virtual -bool LLCrossParcelFunctor::apply(LLViewerObject* obj) -{ - // Add the root object box. - mBoundingBox.addBBoxAgent(LLBBox(obj->getPositionRegion(), obj->getRotationRegion(), obj->getScale() * -0.5f, obj->getScale() * 0.5f).getAxisAligned()); - - // Extend the bounding box across all the children. - LLViewerObject::const_child_list_t children = obj->getChildren(); - for (LLViewerObject::const_child_list_t::const_iterator iter = children.begin(); - iter != children.end(); iter++) - { - LLViewerObject* child = *iter; - mBoundingBox.addBBoxAgent(LLBBox(child->getPositionRegion(), child->getRotationRegion(), child->getScale() * -0.5f, child->getScale() * 0.5f).getAxisAligned()); - } - - bool result = false; - - LLViewerRegion* region = obj->getRegion(); - if (region) - { - std::vector boxes; - boxes.push_back(mBoundingBox); - result = region->objectsCrossParcel(boxes); - } - - return result; -} - -LLFloaterObjectWeights::LLFloaterObjectWeights(const LLSD& key) -: LLFloater(key), - mSelectedObjects(NULL), - mSelectedPrims(NULL), - mSelectedDownloadWeight(NULL), - mSelectedPhysicsWeight(NULL), - mSelectedServerWeight(NULL), - mSelectedDisplayWeight(NULL), - mSelectedOnLand(NULL), - mRezzedOnLand(NULL), - mRemainingCapacity(NULL), - mTotalCapacity(NULL) -{ -} - -LLFloaterObjectWeights::~LLFloaterObjectWeights() -{ -} - -// virtual -bool LLFloaterObjectWeights::postBuild() -{ - mSelectedObjects = getChild("objects"); - mSelectedPrims = getChild("prims"); - - mSelectedDownloadWeight = getChild("download"); - mSelectedPhysicsWeight = getChild("physics"); - mSelectedServerWeight = getChild("server"); - mSelectedDisplayWeight = getChild("display"); - - mSelectedOnLand = getChild("selected"); - mRezzedOnLand = getChild("rezzed_on_land"); - mRemainingCapacity = getChild("remaining_capacity"); - mTotalCapacity = getChild("total_capacity"); - - return true; -} - -// virtual -void LLFloaterObjectWeights::onOpen(const LLSD& key) -{ - refresh(); - updateLandImpacts(LLViewerParcelMgr::getInstance()->getFloatingParcelSelection()->getParcel()); -} - -// virtual -void LLFloaterObjectWeights::onWeightsUpdate(const SelectionCost& selection_cost) -{ - mSelectedDownloadWeight->setText(llformat("%.1f", selection_cost.mNetworkCost)); - mSelectedPhysicsWeight->setText(llformat("%.1f", selection_cost.mPhysicsCost)); - mSelectedServerWeight->setText(llformat("%.1f", selection_cost.mSimulationCost)); - - S32 render_cost = LLSelectMgr::getInstance()->getSelection()->getSelectedObjectRenderCost(); - mSelectedDisplayWeight->setText(llformat("%d", render_cost)); - - toggleWeightsLoadingIndicators(false); -} - -//virtual -void LLFloaterObjectWeights::setErrorStatus(S32 status, const std::string& reason) -{ - const std::string text = getString("nothing_selected"); - - mSelectedDownloadWeight->setText(text); - mSelectedPhysicsWeight->setText(text); - mSelectedServerWeight->setText(text); - mSelectedDisplayWeight->setText(text); - - toggleWeightsLoadingIndicators(false); -} - -void LLFloaterObjectWeights::updateLandImpacts(const LLParcel* parcel) -{ - if (!parcel || LLSelectMgr::getInstance()->getSelection()->isEmpty()) - { - updateIfNothingSelected(); - } - else - { - S32 rezzed_prims = parcel->getSimWidePrimCount(); - S32 total_capacity = parcel->getSimWideMaxPrimCapacity(); - // Can't have more than region max tasks, regardless of parcel - // object bonus factor. - LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion(); - if (region) - { - S32 max_tasks_per_region = (S32)region->getMaxTasks(); - total_capacity = llmin(total_capacity, max_tasks_per_region); - } - - mRezzedOnLand->setText(llformat("%d", rezzed_prims)); - mRemainingCapacity->setText(llformat("%d", total_capacity - rezzed_prims)); - mTotalCapacity->setText(llformat("%d", total_capacity)); - - toggleLandImpactsLoadingIndicators(false); - } -} - -void LLFloaterObjectWeights::refresh() -{ - LLSelectMgr* sel_mgr = LLSelectMgr::getInstance(); - - if (sel_mgr->getSelection()->isEmpty()) - { - updateIfNothingSelected(); - } - else - { - S32 prim_count = sel_mgr->getSelection()->getObjectCount(); - S32 link_count = sel_mgr->getSelection()->getRootObjectCount(); - F32 prim_equiv = sel_mgr->getSelection()->getSelectedLinksetCost(); - - mSelectedObjects->setText(llformat("%d", link_count)); - mSelectedPrims->setText(llformat("%d", prim_count)); - mSelectedOnLand->setText(llformat("%.1d", (S32)prim_equiv)); - - LLCrossParcelFunctor func; - if (sel_mgr->getSelection()->applyToRootObjects(&func, true)) - { - // Some of the selected objects cross parcel bounds. - // We don't display object weights and land impacts in this case. - const std::string text = getString("nothing_selected"); - - mRezzedOnLand->setText(text); - mRemainingCapacity->setText(text); - mTotalCapacity->setText(text); - - toggleLandImpactsLoadingIndicators(false); - } - - LLViewerRegion* region = gAgent.getRegion(); - if (region && region->capabilitiesReceived()) - { - for (LLObjectSelection::valid_root_iterator iter = sel_mgr->getSelection()->valid_root_begin(); - iter != sel_mgr->getSelection()->valid_root_end(); ++iter) - { - LLAccountingCostManager::getInstance()->addObject((*iter)->getObject()->getID()); - } - - std::string url = region->getCapability("ResourceCostSelected"); - if (!url.empty()) - { - // Update the transaction id before the new fetch request - generateTransactionID(); - - LLAccountingCostManager::getInstance()->fetchCosts(Roots, url, getObserverHandle()); - toggleWeightsLoadingIndicators(true); - } - } - else - { - LL_WARNS() << "Failed to get region capabilities" << LL_ENDL; - } - } -} - -// virtual -void LLFloaterObjectWeights::generateTransactionID() -{ - mTransactionID.generate(); -} - -void LLFloaterObjectWeights::toggleWeightsLoadingIndicators(bool visible) -{ - childSetVisible("download_loading_indicator", visible); - childSetVisible("physics_loading_indicator", visible); - childSetVisible("server_loading_indicator", visible); - childSetVisible("display_loading_indicator", visible); - - mSelectedDownloadWeight->setVisible(!visible); - mSelectedPhysicsWeight->setVisible(!visible); - mSelectedServerWeight->setVisible(!visible); - mSelectedDisplayWeight->setVisible(!visible); -} - -void LLFloaterObjectWeights::toggleLandImpactsLoadingIndicators(bool visible) -{ - childSetVisible("selected_loading_indicator", visible); - childSetVisible("rezzed_on_land_loading_indicator", visible); - childSetVisible("remaining_capacity_loading_indicator", visible); - childSetVisible("total_capacity_loading_indicator", visible); - - mSelectedOnLand->setVisible(!visible); - mRezzedOnLand->setVisible(!visible); - mRemainingCapacity->setVisible(!visible); - mTotalCapacity->setVisible(!visible); -} - -void LLFloaterObjectWeights::updateIfNothingSelected() -{ - const std::string text = getString("nothing_selected"); - - mSelectedObjects->setText(text); - mSelectedPrims->setText(text); - - mSelectedDownloadWeight->setText(text); - mSelectedPhysicsWeight->setText(text); - mSelectedServerWeight->setText(text); - mSelectedDisplayWeight->setText(text); - - mSelectedOnLand->setText(text); - mRezzedOnLand->setText(text); - mRemainingCapacity->setText(text); - mTotalCapacity->setText(text); - - toggleWeightsLoadingIndicators(false); - toggleLandImpactsLoadingIndicators(false); -} +/** + * @file llfloaterobjectweights.cpp + * @brief Object weights advanced view floater + * + * $LicenseInfo:firstyear=2011&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2011, 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$ + */ +#include "llviewerprecompiledheaders.h" + +#include "llfloaterobjectweights.h" + +#include "llparcel.h" + +#include "llfloaterreg.h" +#include "lltextbox.h" + +#include "llagent.h" +#include "llviewerparcelmgr.h" +#include "llviewerregion.h" + +// virtual +bool LLCrossParcelFunctor::apply(LLViewerObject* obj) +{ + // Add the root object box. + mBoundingBox.addBBoxAgent(LLBBox(obj->getPositionRegion(), obj->getRotationRegion(), obj->getScale() * -0.5f, obj->getScale() * 0.5f).getAxisAligned()); + + // Extend the bounding box across all the children. + LLViewerObject::const_child_list_t children = obj->getChildren(); + for (LLViewerObject::const_child_list_t::const_iterator iter = children.begin(); + iter != children.end(); iter++) + { + LLViewerObject* child = *iter; + mBoundingBox.addBBoxAgent(LLBBox(child->getPositionRegion(), child->getRotationRegion(), child->getScale() * -0.5f, child->getScale() * 0.5f).getAxisAligned()); + } + + bool result = false; + + LLViewerRegion* region = obj->getRegion(); + if (region) + { + std::vector boxes; + boxes.push_back(mBoundingBox); + result = region->objectsCrossParcel(boxes); + } + + return result; +} + +LLFloaterObjectWeights::LLFloaterObjectWeights(const LLSD& key) +: LLFloater(key), + mSelectedObjects(NULL), + mSelectedPrims(NULL), + mSelectedDownloadWeight(NULL), + mSelectedPhysicsWeight(NULL), + mSelectedServerWeight(NULL), + mSelectedDisplayWeight(NULL), + mSelectedOnLand(NULL), + mRezzedOnLand(NULL), + mRemainingCapacity(NULL), + mTotalCapacity(NULL) +{ +} + +LLFloaterObjectWeights::~LLFloaterObjectWeights() +{ +} + +// virtual +bool LLFloaterObjectWeights::postBuild() +{ + mSelectedObjects = getChild("objects"); + mSelectedPrims = getChild("prims"); + + mSelectedDownloadWeight = getChild("download"); + mSelectedPhysicsWeight = getChild("physics"); + mSelectedServerWeight = getChild("server"); + mSelectedDisplayWeight = getChild("display"); + + mSelectedOnLand = getChild("selected"); + mRezzedOnLand = getChild("rezzed_on_land"); + mRemainingCapacity = getChild("remaining_capacity"); + mTotalCapacity = getChild("total_capacity"); + + return true; +} + +// virtual +void LLFloaterObjectWeights::onOpen(const LLSD& key) +{ + refresh(); + updateLandImpacts(LLViewerParcelMgr::getInstance()->getFloatingParcelSelection()->getParcel()); +} + +// virtual +void LLFloaterObjectWeights::onWeightsUpdate(const SelectionCost& selection_cost) +{ + mSelectedDownloadWeight->setText(llformat("%.1f", selection_cost.mNetworkCost)); + mSelectedPhysicsWeight->setText(llformat("%.1f", selection_cost.mPhysicsCost)); + mSelectedServerWeight->setText(llformat("%.1f", selection_cost.mSimulationCost)); + + S32 render_cost = LLSelectMgr::getInstance()->getSelection()->getSelectedObjectRenderCost(); + mSelectedDisplayWeight->setText(llformat("%d", render_cost)); + + toggleWeightsLoadingIndicators(false); +} + +//virtual +void LLFloaterObjectWeights::setErrorStatus(S32 status, const std::string& reason) +{ + const std::string text = getString("nothing_selected"); + + mSelectedDownloadWeight->setText(text); + mSelectedPhysicsWeight->setText(text); + mSelectedServerWeight->setText(text); + mSelectedDisplayWeight->setText(text); + + toggleWeightsLoadingIndicators(false); +} + +void LLFloaterObjectWeights::updateLandImpacts(const LLParcel* parcel) +{ + if (!parcel || LLSelectMgr::getInstance()->getSelection()->isEmpty()) + { + updateIfNothingSelected(); + } + else + { + S32 rezzed_prims = parcel->getSimWidePrimCount(); + S32 total_capacity = parcel->getSimWideMaxPrimCapacity(); + // Can't have more than region max tasks, regardless of parcel + // object bonus factor. + LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion(); + if (region) + { + S32 max_tasks_per_region = (S32)region->getMaxTasks(); + total_capacity = llmin(total_capacity, max_tasks_per_region); + } + + mRezzedOnLand->setText(llformat("%d", rezzed_prims)); + mRemainingCapacity->setText(llformat("%d", total_capacity - rezzed_prims)); + mTotalCapacity->setText(llformat("%d", total_capacity)); + + toggleLandImpactsLoadingIndicators(false); + } +} + +void LLFloaterObjectWeights::refresh() +{ + LLSelectMgr* sel_mgr = LLSelectMgr::getInstance(); + + if (sel_mgr->getSelection()->isEmpty()) + { + updateIfNothingSelected(); + } + else + { + S32 prim_count = sel_mgr->getSelection()->getObjectCount(); + S32 link_count = sel_mgr->getSelection()->getRootObjectCount(); + F32 prim_equiv = sel_mgr->getSelection()->getSelectedLinksetCost(); + + mSelectedObjects->setText(llformat("%d", link_count)); + mSelectedPrims->setText(llformat("%d", prim_count)); + mSelectedOnLand->setText(llformat("%.1d", (S32)prim_equiv)); + + LLCrossParcelFunctor func; + if (sel_mgr->getSelection()->applyToRootObjects(&func, true)) + { + // Some of the selected objects cross parcel bounds. + // We don't display object weights and land impacts in this case. + const std::string text = getString("nothing_selected"); + + mRezzedOnLand->setText(text); + mRemainingCapacity->setText(text); + mTotalCapacity->setText(text); + + toggleLandImpactsLoadingIndicators(false); + } + + LLViewerRegion* region = gAgent.getRegion(); + if (region && region->capabilitiesReceived()) + { + for (LLObjectSelection::valid_root_iterator iter = sel_mgr->getSelection()->valid_root_begin(); + iter != sel_mgr->getSelection()->valid_root_end(); ++iter) + { + LLAccountingCostManager::getInstance()->addObject((*iter)->getObject()->getID()); + } + + std::string url = region->getCapability("ResourceCostSelected"); + if (!url.empty()) + { + // Update the transaction id before the new fetch request + generateTransactionID(); + + LLAccountingCostManager::getInstance()->fetchCosts(Roots, url, getObserverHandle()); + toggleWeightsLoadingIndicators(true); + } + } + else + { + LL_WARNS() << "Failed to get region capabilities" << LL_ENDL; + } + } +} + +// virtual +void LLFloaterObjectWeights::generateTransactionID() +{ + mTransactionID.generate(); +} + +void LLFloaterObjectWeights::toggleWeightsLoadingIndicators(bool visible) +{ + childSetVisible("download_loading_indicator", visible); + childSetVisible("physics_loading_indicator", visible); + childSetVisible("server_loading_indicator", visible); + childSetVisible("display_loading_indicator", visible); + + mSelectedDownloadWeight->setVisible(!visible); + mSelectedPhysicsWeight->setVisible(!visible); + mSelectedServerWeight->setVisible(!visible); + mSelectedDisplayWeight->setVisible(!visible); +} + +void LLFloaterObjectWeights::toggleLandImpactsLoadingIndicators(bool visible) +{ + childSetVisible("selected_loading_indicator", visible); + childSetVisible("rezzed_on_land_loading_indicator", visible); + childSetVisible("remaining_capacity_loading_indicator", visible); + childSetVisible("total_capacity_loading_indicator", visible); + + mSelectedOnLand->setVisible(!visible); + mRezzedOnLand->setVisible(!visible); + mRemainingCapacity->setVisible(!visible); + mTotalCapacity->setVisible(!visible); +} + +void LLFloaterObjectWeights::updateIfNothingSelected() +{ + const std::string text = getString("nothing_selected"); + + mSelectedObjects->setText(text); + mSelectedPrims->setText(text); + + mSelectedDownloadWeight->setText(text); + mSelectedPhysicsWeight->setText(text); + mSelectedServerWeight->setText(text); + mSelectedDisplayWeight->setText(text); + + mSelectedOnLand->setText(text); + mRezzedOnLand->setText(text); + mRemainingCapacity->setText(text); + mTotalCapacity->setText(text); + + toggleWeightsLoadingIndicators(false); + toggleLandImpactsLoadingIndicators(false); +} -- cgit v1.2.3