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/llpanelcontents.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llpanelcontents.cpp') diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp index 3bae0cebfb..ca4ebf621d 100644 --- a/indra/newview/llpanelcontents.cpp +++ b/indra/newview/llpanelcontents.cpp @@ -76,7 +76,7 @@ const char* LLPanelContents::PERMS_GROUP_CONTROL_KEY = "perms_group_control"; const char* LLPanelContents::PERMS_ANYONE_INTERACT_KEY = "perms_anyone_interact"; const char* LLPanelContents::PERMS_ANYONE_CONTROL_KEY = "perms_anyone_control"; -BOOL LLPanelContents::postBuild() +bool LLPanelContents::postBuild() { setMouseOpaque(FALSE); @@ -85,7 +85,7 @@ BOOL LLPanelContents::postBuild() mPanelInventoryObject = getChild("contents_inventory"); - return TRUE; + return true; } LLPanelContents::LLPanelContents() -- 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/llpanelcontents.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview/llpanelcontents.cpp') diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp index ca4ebf621d..38c6e32e3b 100644 --- a/indra/newview/llpanelcontents.cpp +++ b/indra/newview/llpanelcontents.cpp @@ -78,7 +78,7 @@ const char* LLPanelContents::PERMS_ANYONE_CONTROL_KEY = "perms_anyone_control"; bool LLPanelContents::postBuild() { - setMouseOpaque(FALSE); + setMouseOpaque(false); childSetAction("button new script",&LLPanelContents::onClickNewScript, this); childSetAction("button permissions",&LLPanelContents::onClickPermissions, this); @@ -105,7 +105,7 @@ void LLPanelContents::getState(LLViewerObject *objectp ) { if( !objectp ) { - getChildView("button new script")->setEnabled(FALSE); + getChildView("button new script")->setEnabled(false); return; } @@ -116,7 +116,7 @@ void LLPanelContents::getState(LLViewerObject *objectp ) bool editable = gAgent.isGodlike() || (objectp->permModify() && !objectp->isPermanentEnforced() && ( objectp->permYouOwner() || ( !group_id.isNull() && gAgent.isInGroup(group_id) ))); // solves SL-23488 - BOOL all_volume = LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME ); + bool all_volume = LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME ); // Edit script button - ok if object is editable and there's an unambiguous destination for the object. getChildView("button new script")->setEnabled( @@ -131,7 +131,7 @@ void LLPanelContents::getState(LLViewerObject *objectp ) void LLPanelContents::refresh() { - const BOOL children_ok = TRUE; + const bool children_ok = true; LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(children_ok); getState(object); @@ -157,7 +157,7 @@ void LLPanelContents::clearContents() // static void LLPanelContents::onClickNewScript(void *userdata) { - const BOOL children_ok = TRUE; + const bool children_ok = true; LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(children_ok); if(object) { @@ -186,7 +186,7 @@ void LLPanelContents::onClickNewScript(void *userdata) LLSaleInfo::DEFAULT, LLInventoryItemFlags::II_FLAGS_NONE, time_corrected()); - object->saveScript(new_item, TRUE, true); + object->saveScript(new_item, true, true); std::string name = new_item->getName(); -- 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/llpanelcontents.cpp | 416 +++++++++++++++++++------------------- 1 file changed, 208 insertions(+), 208 deletions(-) (limited to 'indra/newview/llpanelcontents.cpp') diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp index 7413a2d93e..7b78ad2934 100644 --- a/indra/newview/llpanelcontents.cpp +++ b/indra/newview/llpanelcontents.cpp @@ -1,208 +1,208 @@ -/** - * @file llpanelcontents.cpp - * @brief Object contents panel in the tools floater. - * - * $LicenseInfo:firstyear=2001&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$ - */ - -#include "llviewerprecompiledheaders.h" - -// file include -#include "llpanelcontents.h" - -// linden library includes -#include "llerror.h" -#include "llfloaterreg.h" -#include "llfontgl.h" -#include "llinventorydefines.h" -#include "llmaterialtable.h" -#include "llpermissionsflags.h" -#include "llrect.h" -#include "llstring.h" -#include "llui.h" -#include "m3math.h" -#include "material_codes.h" - -// project includes -#include "llagent.h" -#include "llpanelobjectinventory.h" -#include "llpreviewscript.h" -#include "llresmgr.h" -#include "llselectmgr.h" -#include "lltool.h" -#include "lltoolcomp.h" -#include "lltoolmgr.h" -#include "lltrans.h" -#include "llviewerassettype.h" -#include "llviewerinventory.h" -#include "llviewerobject.h" -#include "llviewerregion.h" -#include "llviewerwindow.h" -#include "llworld.h" -#include "llfloaterperms.h" - -// -// Imported globals -// - - -// -// Globals -// -const char* LLPanelContents::TENTATIVE_SUFFIX = "_tentative"; -const char* LLPanelContents::PERMS_OWNER_INTERACT_KEY = "perms_owner_interact"; -const char* LLPanelContents::PERMS_OWNER_CONTROL_KEY = "perms_owner_control"; -const char* LLPanelContents::PERMS_GROUP_INTERACT_KEY = "perms_group_interact"; -const char* LLPanelContents::PERMS_GROUP_CONTROL_KEY = "perms_group_control"; -const char* LLPanelContents::PERMS_ANYONE_INTERACT_KEY = "perms_anyone_interact"; -const char* LLPanelContents::PERMS_ANYONE_CONTROL_KEY = "perms_anyone_control"; - -bool LLPanelContents::postBuild() -{ - setMouseOpaque(false); - - childSetAction("button new script",&LLPanelContents::onClickNewScript, this); - childSetAction("button permissions",&LLPanelContents::onClickPermissions, this); - - mPanelInventoryObject = getChild("contents_inventory"); - - return true; -} - -LLPanelContents::LLPanelContents() - : LLPanel(), - mPanelInventoryObject(NULL) -{ -} - - -LLPanelContents::~LLPanelContents() -{ - // Children all cleaned up by default view destructor. -} - - -void LLPanelContents::getState(LLViewerObject *objectp ) -{ - if( !objectp ) - { - getChildView("button new script")->setEnabled(false); - return; - } - - LLUUID group_id; // used for SL-23488 - LLSelectMgr::getInstance()->selectGetGroup(group_id); // sets group_id as a side effect SL-23488 - - // BUG? Check for all objects being editable? - bool editable = gAgent.isGodlike() - || (objectp->permModify() && !objectp->isPermanentEnforced() - && ( objectp->permYouOwner() || ( !group_id.isNull() && gAgent.isInGroup(group_id) ))); // solves SL-23488 - bool all_volume = LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME ); - - // Edit script button - ok if object is editable and there's an unambiguous destination for the object. - getChildView("button new script")->setEnabled( - editable && - all_volume && - ((LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() == 1) - || (LLSelectMgr::getInstance()->getSelection()->getObjectCount() == 1))); - - getChildView("button permissions")->setEnabled(!objectp->isPermanentEnforced()); - mPanelInventoryObject->setEnabled(!objectp->isPermanentEnforced()); -} - -void LLPanelContents::refresh() -{ - const bool children_ok = true; - LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(children_ok); - - getState(object); - if (mPanelInventoryObject) - { - mPanelInventoryObject->refresh(); - } -} - -void LLPanelContents::clearContents() -{ - if (mPanelInventoryObject) - { - mPanelInventoryObject->clearInventoryTask(); - } -} - - -// -// Static functions -// - -// static -void LLPanelContents::onClickNewScript(void *userdata) -{ - const bool children_ok = true; - LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(children_ok); - if(object) - { - LLPermissions perm; - perm.init(gAgent.getID(), gAgent.getID(), LLUUID::null, LLUUID::null); - - // Parameters are base, owner, everyone, group, next - perm.initMasks( - PERM_ALL, - PERM_ALL, - LLFloaterPerms::getEveryonePerms("Scripts"), - LLFloaterPerms::getGroupPerms("Scripts"), - PERM_MOVE | LLFloaterPerms::getNextOwnerPerms("Scripts")); - std::string desc; - LLViewerAssetType::generateDescriptionFor(LLAssetType::AT_LSL_TEXT, desc); - LLPointer new_item = - new LLViewerInventoryItem( - LLUUID::null, - LLUUID::null, - perm, - LLUUID::null, - LLAssetType::AT_LSL_TEXT, - LLInventoryType::IT_LSL, - "New Script", - desc, - LLSaleInfo::DEFAULT, - LLInventoryItemFlags::II_FLAGS_NONE, - time_corrected()); - object->saveScript(new_item, true, true); - - std::string name = new_item->getName(); - - // *NOTE: In order to resolve SL-22177, we needed to create - // the script first, and then you have to click it in - // inventory to edit it. - // *TODO: The script creation should round-trip back to the - // viewer so the viewer can auto-open the script and start - // editing ASAP. - } -} - - -// static -void LLPanelContents::onClickPermissions(void *userdata) -{ - LLPanelContents* self = (LLPanelContents*)userdata; - gFloaterView->getParentFloater(self)->addDependentFloater(LLFloaterReg::showInstance("bulk_perms")); -} +/** + * @file llpanelcontents.cpp + * @brief Object contents panel in the tools floater. + * + * $LicenseInfo:firstyear=2001&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$ + */ + +#include "llviewerprecompiledheaders.h" + +// file include +#include "llpanelcontents.h" + +// linden library includes +#include "llerror.h" +#include "llfloaterreg.h" +#include "llfontgl.h" +#include "llinventorydefines.h" +#include "llmaterialtable.h" +#include "llpermissionsflags.h" +#include "llrect.h" +#include "llstring.h" +#include "llui.h" +#include "m3math.h" +#include "material_codes.h" + +// project includes +#include "llagent.h" +#include "llpanelobjectinventory.h" +#include "llpreviewscript.h" +#include "llresmgr.h" +#include "llselectmgr.h" +#include "lltool.h" +#include "lltoolcomp.h" +#include "lltoolmgr.h" +#include "lltrans.h" +#include "llviewerassettype.h" +#include "llviewerinventory.h" +#include "llviewerobject.h" +#include "llviewerregion.h" +#include "llviewerwindow.h" +#include "llworld.h" +#include "llfloaterperms.h" + +// +// Imported globals +// + + +// +// Globals +// +const char* LLPanelContents::TENTATIVE_SUFFIX = "_tentative"; +const char* LLPanelContents::PERMS_OWNER_INTERACT_KEY = "perms_owner_interact"; +const char* LLPanelContents::PERMS_OWNER_CONTROL_KEY = "perms_owner_control"; +const char* LLPanelContents::PERMS_GROUP_INTERACT_KEY = "perms_group_interact"; +const char* LLPanelContents::PERMS_GROUP_CONTROL_KEY = "perms_group_control"; +const char* LLPanelContents::PERMS_ANYONE_INTERACT_KEY = "perms_anyone_interact"; +const char* LLPanelContents::PERMS_ANYONE_CONTROL_KEY = "perms_anyone_control"; + +bool LLPanelContents::postBuild() +{ + setMouseOpaque(false); + + childSetAction("button new script",&LLPanelContents::onClickNewScript, this); + childSetAction("button permissions",&LLPanelContents::onClickPermissions, this); + + mPanelInventoryObject = getChild("contents_inventory"); + + return true; +} + +LLPanelContents::LLPanelContents() + : LLPanel(), + mPanelInventoryObject(NULL) +{ +} + + +LLPanelContents::~LLPanelContents() +{ + // Children all cleaned up by default view destructor. +} + + +void LLPanelContents::getState(LLViewerObject *objectp ) +{ + if( !objectp ) + { + getChildView("button new script")->setEnabled(false); + return; + } + + LLUUID group_id; // used for SL-23488 + LLSelectMgr::getInstance()->selectGetGroup(group_id); // sets group_id as a side effect SL-23488 + + // BUG? Check for all objects being editable? + bool editable = gAgent.isGodlike() + || (objectp->permModify() && !objectp->isPermanentEnforced() + && ( objectp->permYouOwner() || ( !group_id.isNull() && gAgent.isInGroup(group_id) ))); // solves SL-23488 + bool all_volume = LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME ); + + // Edit script button - ok if object is editable and there's an unambiguous destination for the object. + getChildView("button new script")->setEnabled( + editable && + all_volume && + ((LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() == 1) + || (LLSelectMgr::getInstance()->getSelection()->getObjectCount() == 1))); + + getChildView("button permissions")->setEnabled(!objectp->isPermanentEnforced()); + mPanelInventoryObject->setEnabled(!objectp->isPermanentEnforced()); +} + +void LLPanelContents::refresh() +{ + const bool children_ok = true; + LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(children_ok); + + getState(object); + if (mPanelInventoryObject) + { + mPanelInventoryObject->refresh(); + } +} + +void LLPanelContents::clearContents() +{ + if (mPanelInventoryObject) + { + mPanelInventoryObject->clearInventoryTask(); + } +} + + +// +// Static functions +// + +// static +void LLPanelContents::onClickNewScript(void *userdata) +{ + const bool children_ok = true; + LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(children_ok); + if(object) + { + LLPermissions perm; + perm.init(gAgent.getID(), gAgent.getID(), LLUUID::null, LLUUID::null); + + // Parameters are base, owner, everyone, group, next + perm.initMasks( + PERM_ALL, + PERM_ALL, + LLFloaterPerms::getEveryonePerms("Scripts"), + LLFloaterPerms::getGroupPerms("Scripts"), + PERM_MOVE | LLFloaterPerms::getNextOwnerPerms("Scripts")); + std::string desc; + LLViewerAssetType::generateDescriptionFor(LLAssetType::AT_LSL_TEXT, desc); + LLPointer new_item = + new LLViewerInventoryItem( + LLUUID::null, + LLUUID::null, + perm, + LLUUID::null, + LLAssetType::AT_LSL_TEXT, + LLInventoryType::IT_LSL, + "New Script", + desc, + LLSaleInfo::DEFAULT, + LLInventoryItemFlags::II_FLAGS_NONE, + time_corrected()); + object->saveScript(new_item, true, true); + + std::string name = new_item->getName(); + + // *NOTE: In order to resolve SL-22177, we needed to create + // the script first, and then you have to click it in + // inventory to edit it. + // *TODO: The script creation should round-trip back to the + // viewer so the viewer can auto-open the script and start + // editing ASAP. + } +} + + +// static +void LLPanelContents::onClickPermissions(void *userdata) +{ + LLPanelContents* self = (LLPanelContents*)userdata; + gFloaterView->getParentFloater(self)->addDependentFloater(LLFloaterReg::showInstance("bulk_perms")); +} -- cgit v1.2.3