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/llfloateropenobject.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfloateropenobject.cpp') diff --git a/indra/newview/llfloateropenobject.cpp b/indra/newview/llfloateropenobject.cpp index d3ab22f792..b246f6283d 100644 --- a/indra/newview/llfloateropenobject.cpp +++ b/indra/newview/llfloateropenobject.cpp @@ -65,13 +65,13 @@ LLFloaterOpenObject::~LLFloaterOpenObject() } // virtual -BOOL LLFloaterOpenObject::postBuild() +bool LLFloaterOpenObject::postBuild() { getChild("object_name")->setTextArg("[DESC]", std::string("Object") ); // *Note: probably do not want to translate this mPanelInventoryObject = getChild("object_contents"); refresh(); - return TRUE; + return true; } void LLFloaterOpenObject::onOpen(const LLSD& key) -- cgit v1.2.3 From 60d3dd98a44230c21803c1606552ee098ed9fa7c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 21 Feb 2024 21:05:14 +0100 Subject: Convert remaining BOOL to bool --- indra/newview/llfloateropenobject.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'indra/newview/llfloateropenobject.cpp') diff --git a/indra/newview/llfloateropenobject.cpp b/indra/newview/llfloateropenobject.cpp index b246f6283d..ec3dee1d89 100644 --- a/indra/newview/llfloateropenobject.cpp +++ b/indra/newview/llfloateropenobject.cpp @@ -53,7 +53,7 @@ LLFloaterOpenObject::LLFloaterOpenObject(const LLSD& key) : LLFloater(key), mPanelInventoryObject(NULL), - mDirty(TRUE) + mDirty(true) { mCommitCallbackRegistrar.add("OpenObject.MoveToInventory", boost::bind(&LLFloaterOpenObject::onClickMoveToInventory, this)); mCommitCallbackRegistrar.add("OpenObject.Cancel", boost::bind(&LLFloaterOpenObject::onClickCancel, this)); @@ -97,18 +97,18 @@ void LLFloaterOpenObject::refresh() mPanelInventoryObject->refresh(); std::string name = ""; - BOOL enabled = FALSE; + bool enabled = false; LLSelectNode* node = mObjectSelection->getFirstRootNode(); if (node) { name = node->mName; - enabled = TRUE; + enabled = true; } else { name = ""; - enabled = FALSE; + enabled = false; } getChild("object_name")->setTextArg("[DESC]", name); @@ -123,14 +123,14 @@ void LLFloaterOpenObject::draw() if (mDirty) { refresh(); - mDirty = FALSE; + mDirty = false; } LLFloater::draw(); } void LLFloaterOpenObject::dirty() { - mDirty = TRUE; + mDirty = true; } @@ -184,9 +184,9 @@ void LLFloaterOpenObject::callbackCreateInventoryCategory(const LLUUID& category // Copy and/or move the items into the newly created folder. // Ignore any "you're going to break this item" messages. - BOOL success = move_inv_category_world_to_agent(object_id, + bool success = move_inv_category_world_to_agent(object_id, category_id, - TRUE, + true, [](S32 result, void* data, const LLMoveInv*) { callbackMoveInventory(result, data); -- 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/llfloateropenobject.cpp | 460 +++++++++++++++++----------------- 1 file changed, 230 insertions(+), 230 deletions(-) (limited to 'indra/newview/llfloateropenobject.cpp') diff --git a/indra/newview/llfloateropenobject.cpp b/indra/newview/llfloateropenobject.cpp index 91987f22f3..b06e35f65d 100644 --- a/indra/newview/llfloateropenobject.cpp +++ b/indra/newview/llfloateropenobject.cpp @@ -1,230 +1,230 @@ -/** - * @file llfloateropenobject.cpp - * @brief LLFloaterOpenObject class implementation - * - * $LicenseInfo:firstyear=2004&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$ - */ - -/* - * Shows the contents of an object. - * A floater wrapper for LLPanelObjectInventory - */ - -#include "llviewerprecompiledheaders.h" - -#include "llfloateropenobject.h" - -#include "llcachename.h" -#include "llbutton.h" -#include "llnotificationsutil.h" -#include "lltextbox.h" - -#include "llinventorybridge.h" -#include "llinventorymodel.h" -#include "llinventorypanel.h" -#include "llpanelobjectinventory.h" -#include "llfloaterreg.h" -#include "llselectmgr.h" -#include "lluiconstants.h" -#include "llviewerobject.h" -#include "lluictrlfactory.h" -#include "llviewerwindow.h" - - -LLFloaterOpenObject::LLFloaterOpenObject(const LLSD& key) -: LLFloater(key), - mPanelInventoryObject(NULL), - mDirty(true) -{ - mCommitCallbackRegistrar.add("OpenObject.MoveToInventory", boost::bind(&LLFloaterOpenObject::onClickMoveToInventory, this)); - mCommitCallbackRegistrar.add("OpenObject.Cancel", boost::bind(&LLFloaterOpenObject::onClickCancel, this)); -} - -LLFloaterOpenObject::~LLFloaterOpenObject() -{ -// sInstance = NULL; -} - -// virtual -bool LLFloaterOpenObject::postBuild() -{ - getChild("object_name")->setTextArg("[DESC]", std::string("Object") ); // *Note: probably do not want to translate this - mPanelInventoryObject = getChild("object_contents"); - - refresh(); - return true; -} - -void LLFloaterOpenObject::onOpen(const LLSD& key) -{ - LLObjectSelectionHandle object_selection = LLSelectMgr::getInstance()->getSelection(); - if (object_selection->getRootObjectCount() != 1) - { - LLNotificationsUtil::add("UnableToViewContentsMoreThanOne"); - closeFloater(); - return; - } - if(!(object_selection->getPrimaryObject())) - { - closeFloater(); - return; - } - mObjectSelection = LLSelectMgr::getInstance()->getEditSelection(); - refresh(); -} - -void LLFloaterOpenObject::refresh() -{ - mPanelInventoryObject->refresh(); - - std::string name = ""; - bool enabled = false; - - LLSelectNode* node = mObjectSelection->getFirstRootNode(); - if (node) - { - name = node->mName; - enabled = true; - } - else - { - name = ""; - enabled = false; - } - - getChild("object_name")->setTextArg("[DESC]", name); - getChildView("copy_to_inventory_button")->setEnabled(enabled); - getChildView("copy_and_wear_button")->setEnabled(enabled); - getChildView("copy_and_replace_button")->setEnabled(enabled); - -} - -void LLFloaterOpenObject::draw() -{ - if (mDirty) - { - refresh(); - mDirty = false; - } - LLFloater::draw(); -} - -void LLFloaterOpenObject::dirty() -{ - mDirty = true; -} - - - -void LLFloaterOpenObject::moveToInventory(bool wear, bool replace) -{ - if (mObjectSelection->getRootObjectCount() != 1) - { - LLNotificationsUtil::add("OnlyCopyContentsOfSingleItem"); - return; - } - - LLSelectNode* node = mObjectSelection->getFirstRootNode(); - if (!node) return; - LLViewerObject* object = node->getObject(); - if (!object) return; - - LLUUID object_id = object->getID(); - std::string name = node->mName; - - // Either create a sub-folder of clothing, or of the root folder. - LLUUID parent_category_id; - if (wear) - { - parent_category_id = gInventory.findCategoryUUIDForType( - LLFolderType::FT_CLOTHING); - } - else - { - parent_category_id = gInventory.getRootFolderID(); - } - - inventory_func_type func = boost::bind(LLFloaterOpenObject::callbackCreateInventoryCategory,_1,object_id,wear,replace); - // D567 copy thumbnail info - gInventory.createNewCategory( - parent_category_id, - LLFolderType::FT_NONE, - name, - func); -} - -// static -void LLFloaterOpenObject::callbackCreateInventoryCategory(const LLUUID& category_id, LLUUID object_id, bool wear, bool replace) -{ - LLCatAndWear* wear_data = new LLCatAndWear; - - wear_data->mCatID = category_id; - wear_data->mWear = wear; - wear_data->mFolderResponded = true; - wear_data->mReplace = replace; - - // Copy and/or move the items into the newly created folder. - // Ignore any "you're going to break this item" messages. - bool success = move_inv_category_world_to_agent(object_id, - category_id, - true, - [](S32 result, void* data, const LLMoveInv*) - { - callbackMoveInventory(result, data); - }, - (void*)wear_data); - if (!success) - { - delete wear_data; - wear_data = NULL; - - LLNotificationsUtil::add("OpenObjectCannotCopy"); - } -} - -// static -void LLFloaterOpenObject::callbackMoveInventory(S32 result, void* data) -{ - LLCatAndWear* cat = (LLCatAndWear*)data; - - if (result == 0) - { - LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(); - if (active_panel) - { - active_panel->setSelection(cat->mCatID, TAKE_FOCUS_NO); - } - } - - delete cat; -} - -void LLFloaterOpenObject::onClickMoveToInventory() -{ - moveToInventory(false); - closeFloater(); -} - -void LLFloaterOpenObject::onClickCancel() -{ - closeFloater(); -} +/** + * @file llfloateropenobject.cpp + * @brief LLFloaterOpenObject class implementation + * + * $LicenseInfo:firstyear=2004&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$ + */ + +/* + * Shows the contents of an object. + * A floater wrapper for LLPanelObjectInventory + */ + +#include "llviewerprecompiledheaders.h" + +#include "llfloateropenobject.h" + +#include "llcachename.h" +#include "llbutton.h" +#include "llnotificationsutil.h" +#include "lltextbox.h" + +#include "llinventorybridge.h" +#include "llinventorymodel.h" +#include "llinventorypanel.h" +#include "llpanelobjectinventory.h" +#include "llfloaterreg.h" +#include "llselectmgr.h" +#include "lluiconstants.h" +#include "llviewerobject.h" +#include "lluictrlfactory.h" +#include "llviewerwindow.h" + + +LLFloaterOpenObject::LLFloaterOpenObject(const LLSD& key) +: LLFloater(key), + mPanelInventoryObject(NULL), + mDirty(true) +{ + mCommitCallbackRegistrar.add("OpenObject.MoveToInventory", boost::bind(&LLFloaterOpenObject::onClickMoveToInventory, this)); + mCommitCallbackRegistrar.add("OpenObject.Cancel", boost::bind(&LLFloaterOpenObject::onClickCancel, this)); +} + +LLFloaterOpenObject::~LLFloaterOpenObject() +{ +// sInstance = NULL; +} + +// virtual +bool LLFloaterOpenObject::postBuild() +{ + getChild("object_name")->setTextArg("[DESC]", std::string("Object") ); // *Note: probably do not want to translate this + mPanelInventoryObject = getChild("object_contents"); + + refresh(); + return true; +} + +void LLFloaterOpenObject::onOpen(const LLSD& key) +{ + LLObjectSelectionHandle object_selection = LLSelectMgr::getInstance()->getSelection(); + if (object_selection->getRootObjectCount() != 1) + { + LLNotificationsUtil::add("UnableToViewContentsMoreThanOne"); + closeFloater(); + return; + } + if(!(object_selection->getPrimaryObject())) + { + closeFloater(); + return; + } + mObjectSelection = LLSelectMgr::getInstance()->getEditSelection(); + refresh(); +} + +void LLFloaterOpenObject::refresh() +{ + mPanelInventoryObject->refresh(); + + std::string name = ""; + bool enabled = false; + + LLSelectNode* node = mObjectSelection->getFirstRootNode(); + if (node) + { + name = node->mName; + enabled = true; + } + else + { + name = ""; + enabled = false; + } + + getChild("object_name")->setTextArg("[DESC]", name); + getChildView("copy_to_inventory_button")->setEnabled(enabled); + getChildView("copy_and_wear_button")->setEnabled(enabled); + getChildView("copy_and_replace_button")->setEnabled(enabled); + +} + +void LLFloaterOpenObject::draw() +{ + if (mDirty) + { + refresh(); + mDirty = false; + } + LLFloater::draw(); +} + +void LLFloaterOpenObject::dirty() +{ + mDirty = true; +} + + + +void LLFloaterOpenObject::moveToInventory(bool wear, bool replace) +{ + if (mObjectSelection->getRootObjectCount() != 1) + { + LLNotificationsUtil::add("OnlyCopyContentsOfSingleItem"); + return; + } + + LLSelectNode* node = mObjectSelection->getFirstRootNode(); + if (!node) return; + LLViewerObject* object = node->getObject(); + if (!object) return; + + LLUUID object_id = object->getID(); + std::string name = node->mName; + + // Either create a sub-folder of clothing, or of the root folder. + LLUUID parent_category_id; + if (wear) + { + parent_category_id = gInventory.findCategoryUUIDForType( + LLFolderType::FT_CLOTHING); + } + else + { + parent_category_id = gInventory.getRootFolderID(); + } + + inventory_func_type func = boost::bind(LLFloaterOpenObject::callbackCreateInventoryCategory,_1,object_id,wear,replace); + // D567 copy thumbnail info + gInventory.createNewCategory( + parent_category_id, + LLFolderType::FT_NONE, + name, + func); +} + +// static +void LLFloaterOpenObject::callbackCreateInventoryCategory(const LLUUID& category_id, LLUUID object_id, bool wear, bool replace) +{ + LLCatAndWear* wear_data = new LLCatAndWear; + + wear_data->mCatID = category_id; + wear_data->mWear = wear; + wear_data->mFolderResponded = true; + wear_data->mReplace = replace; + + // Copy and/or move the items into the newly created folder. + // Ignore any "you're going to break this item" messages. + bool success = move_inv_category_world_to_agent(object_id, + category_id, + true, + [](S32 result, void* data, const LLMoveInv*) + { + callbackMoveInventory(result, data); + }, + (void*)wear_data); + if (!success) + { + delete wear_data; + wear_data = NULL; + + LLNotificationsUtil::add("OpenObjectCannotCopy"); + } +} + +// static +void LLFloaterOpenObject::callbackMoveInventory(S32 result, void* data) +{ + LLCatAndWear* cat = (LLCatAndWear*)data; + + if (result == 0) + { + LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(); + if (active_panel) + { + active_panel->setSelection(cat->mCatID, TAKE_FOCUS_NO); + } + } + + delete cat; +} + +void LLFloaterOpenObject::onClickMoveToInventory() +{ + moveToInventory(false); + closeFloater(); +} + +void LLFloaterOpenObject::onClickCancel() +{ + closeFloater(); +} -- cgit v1.2.3