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/llinspectremoteobject.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llinspectremoteobject.cpp') diff --git a/indra/newview/llinspectremoteobject.cpp b/indra/newview/llinspectremoteobject.cpp index 77320510a6..5b63eb045d 100644 --- a/indra/newview/llinspectremoteobject.cpp +++ b/indra/newview/llinspectremoteobject.cpp @@ -51,7 +51,7 @@ public: LLInspectRemoteObject(const LLSD& object_id); virtual ~LLInspectRemoteObject() {}; - /*virtual*/ BOOL postBuild(void); + /*virtual*/ bool postBuild(void); /*virtual*/ void onOpen(const LLSD& avatar_id); void onClickMap(); @@ -80,7 +80,7 @@ LLInspectRemoteObject::LLInspectRemoteObject(const LLSD& sd) : } /*virtual*/ -BOOL LLInspectRemoteObject::postBuild(void) +bool LLInspectRemoteObject::postBuild(void) { // hook up the inspector's buttons getChild("map_btn")->setCommitCallback( @@ -90,7 +90,7 @@ BOOL LLInspectRemoteObject::postBuild(void) getChild("close_btn")->setCommitCallback( boost::bind(&LLInspectRemoteObject::onClickClose, this)); - 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/llinspectremoteobject.cpp | 368 ++++++++++++++++---------------- 1 file changed, 184 insertions(+), 184 deletions(-) (limited to 'indra/newview/llinspectremoteobject.cpp') diff --git a/indra/newview/llinspectremoteobject.cpp b/indra/newview/llinspectremoteobject.cpp index 1685d3e825..0060fe544d 100644 --- a/indra/newview/llinspectremoteobject.cpp +++ b/indra/newview/llinspectremoteobject.cpp @@ -1,184 +1,184 @@ -/** - * @file llinspectremoteobject.cpp - * - * $LicenseInfo:firstyear=2009&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" - -#include "llfloaterreg.h" -#include "llinspectremoteobject.h" -#include "llinspect.h" -#include "llmutelist.h" -#include "llpanelblockedlist.h" -#include "llslurl.h" -#include "lltrans.h" -#include "llui.h" -#include "lluictrl.h" -#include "llurlaction.h" - -////////////////////////////////////////////////////////////////////////////// -// LLInspectRemoteObject -////////////////////////////////////////////////////////////////////////////// - -// Remote Object Inspector, a small information window used to -// display information about potentially-remote objects. Used -// to display details about objects sending messages to the user. -class LLInspectRemoteObject : public LLInspect -{ - friend class LLFloaterReg; - -public: - LLInspectRemoteObject(const LLSD& object_id); - virtual ~LLInspectRemoteObject() {}; - - /*virtual*/ bool postBuild(void); - /*virtual*/ void onOpen(const LLSD& avatar_id); - - void onClickMap(); - void onClickBlock(); - void onClickClose(); - -private: - void update(); - -private: - LLUUID mObjectID; - LLUUID mOwnerID; - std::string mSLurl; - std::string mName; - bool mGroupOwned; -}; - -LLInspectRemoteObject::LLInspectRemoteObject(const LLSD& sd) : - LLInspect(LLSD()), - mObjectID(NULL), - mOwnerID(NULL), - mSLurl(""), - mName(""), - mGroupOwned(false) -{ -} - -/*virtual*/ -bool LLInspectRemoteObject::postBuild(void) -{ - // hook up the inspector's buttons - getChild("map_btn")->setCommitCallback( - boost::bind(&LLInspectRemoteObject::onClickMap, this)); - getChild("block_btn")->setCommitCallback( - boost::bind(&LLInspectRemoteObject::onClickBlock, this)); - getChild("close_btn")->setCommitCallback( - boost::bind(&LLInspectRemoteObject::onClickClose, this)); - - return true; -} - -/*virtual*/ -void LLInspectRemoteObject::onOpen(const LLSD& data) -{ - // Start animation - LLInspect::onOpen(data); - - // Extract appropriate object information from input LLSD - // (Eventually, it might be nice to query server for details - // rather than require caller to pass in the information.) - mObjectID = data["object_id"].asUUID(); - mName = data["name"].asString(); - mOwnerID = data["owner_id"].asUUID(); - mGroupOwned = data["group_owned"].asBoolean(); - mSLurl = data["slurl"].asString(); - - // update the inspector with the current object state - update(); - - LLInspect::repositionInspector(data); -} - -void LLInspectRemoteObject::onClickMap() -{ - std::string url = "secondlife://" + mSLurl; - LLUrlAction::showLocationOnMap(url); - closeFloater(); -} - -void LLInspectRemoteObject::onClickBlock() -{ - LLMute mute(mObjectID, mName, LLMute::OBJECT); - LLMuteList::getInstance()->add(mute); - LLPanelBlockedList::showPanelAndSelect(mute.mID); - closeFloater(); -} - -void LLInspectRemoteObject::onClickClose() -{ - closeFloater(); -} - -void LLInspectRemoteObject::update() -{ - // show the object name as the inspector's title - // (don't hyperlink URLs in object names) - getChild("object_name")->setValue("" + mName + ""); - - // show the object's owner - click it to show profile - std::string owner; - if (! mOwnerID.isNull()) - { - if (mGroupOwned) - { - owner = LLSLURL("group", mOwnerID, "about").getSLURLString(); - } - else - { - owner = LLSLURL("agent", mOwnerID, "about").getSLURLString(); - } - } - else - { - owner = LLTrans::getString("Unknown"); - } - getChild("object_owner")->setValue(owner); - - // display the object's SLurl - click it to teleport - std::string url; - if (! mSLurl.empty()) - { - url = "secondlife:///app/teleport/" + mSLurl; - } - getChild("object_slurl")->setValue(url); - - // disable the Map button if we don't have a SLurl - getChild("map_btn")->setEnabled(! mSLurl.empty()); - - // disable the Block button if we don't have the object ID (will this ever happen?) - getChild("block_btn")->setEnabled(!mObjectID.isNull() && !LLMuteList::getInstance()->isMuted(mObjectID)); -} - -////////////////////////////////////////////////////////////////////////////// -// LLInspectRemoteObjectUtil -////////////////////////////////////////////////////////////////////////////// -void LLInspectRemoteObjectUtil::registerFloater() -{ - LLFloaterReg::add("inspect_remote_object", "inspect_remote_object.xml", - &LLFloaterReg::build); -} +/** + * @file llinspectremoteobject.cpp + * + * $LicenseInfo:firstyear=2009&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" + +#include "llfloaterreg.h" +#include "llinspectremoteobject.h" +#include "llinspect.h" +#include "llmutelist.h" +#include "llpanelblockedlist.h" +#include "llslurl.h" +#include "lltrans.h" +#include "llui.h" +#include "lluictrl.h" +#include "llurlaction.h" + +////////////////////////////////////////////////////////////////////////////// +// LLInspectRemoteObject +////////////////////////////////////////////////////////////////////////////// + +// Remote Object Inspector, a small information window used to +// display information about potentially-remote objects. Used +// to display details about objects sending messages to the user. +class LLInspectRemoteObject : public LLInspect +{ + friend class LLFloaterReg; + +public: + LLInspectRemoteObject(const LLSD& object_id); + virtual ~LLInspectRemoteObject() {}; + + /*virtual*/ bool postBuild(void); + /*virtual*/ void onOpen(const LLSD& avatar_id); + + void onClickMap(); + void onClickBlock(); + void onClickClose(); + +private: + void update(); + +private: + LLUUID mObjectID; + LLUUID mOwnerID; + std::string mSLurl; + std::string mName; + bool mGroupOwned; +}; + +LLInspectRemoteObject::LLInspectRemoteObject(const LLSD& sd) : + LLInspect(LLSD()), + mObjectID(NULL), + mOwnerID(NULL), + mSLurl(""), + mName(""), + mGroupOwned(false) +{ +} + +/*virtual*/ +bool LLInspectRemoteObject::postBuild(void) +{ + // hook up the inspector's buttons + getChild("map_btn")->setCommitCallback( + boost::bind(&LLInspectRemoteObject::onClickMap, this)); + getChild("block_btn")->setCommitCallback( + boost::bind(&LLInspectRemoteObject::onClickBlock, this)); + getChild("close_btn")->setCommitCallback( + boost::bind(&LLInspectRemoteObject::onClickClose, this)); + + return true; +} + +/*virtual*/ +void LLInspectRemoteObject::onOpen(const LLSD& data) +{ + // Start animation + LLInspect::onOpen(data); + + // Extract appropriate object information from input LLSD + // (Eventually, it might be nice to query server for details + // rather than require caller to pass in the information.) + mObjectID = data["object_id"].asUUID(); + mName = data["name"].asString(); + mOwnerID = data["owner_id"].asUUID(); + mGroupOwned = data["group_owned"].asBoolean(); + mSLurl = data["slurl"].asString(); + + // update the inspector with the current object state + update(); + + LLInspect::repositionInspector(data); +} + +void LLInspectRemoteObject::onClickMap() +{ + std::string url = "secondlife://" + mSLurl; + LLUrlAction::showLocationOnMap(url); + closeFloater(); +} + +void LLInspectRemoteObject::onClickBlock() +{ + LLMute mute(mObjectID, mName, LLMute::OBJECT); + LLMuteList::getInstance()->add(mute); + LLPanelBlockedList::showPanelAndSelect(mute.mID); + closeFloater(); +} + +void LLInspectRemoteObject::onClickClose() +{ + closeFloater(); +} + +void LLInspectRemoteObject::update() +{ + // show the object name as the inspector's title + // (don't hyperlink URLs in object names) + getChild("object_name")->setValue("" + mName + ""); + + // show the object's owner - click it to show profile + std::string owner; + if (! mOwnerID.isNull()) + { + if (mGroupOwned) + { + owner = LLSLURL("group", mOwnerID, "about").getSLURLString(); + } + else + { + owner = LLSLURL("agent", mOwnerID, "about").getSLURLString(); + } + } + else + { + owner = LLTrans::getString("Unknown"); + } + getChild("object_owner")->setValue(owner); + + // display the object's SLurl - click it to teleport + std::string url; + if (! mSLurl.empty()) + { + url = "secondlife:///app/teleport/" + mSLurl; + } + getChild("object_slurl")->setValue(url); + + // disable the Map button if we don't have a SLurl + getChild("map_btn")->setEnabled(! mSLurl.empty()); + + // disable the Block button if we don't have the object ID (will this ever happen?) + getChild("block_btn")->setEnabled(!mObjectID.isNull() && !LLMuteList::getInstance()->isMuted(mObjectID)); +} + +////////////////////////////////////////////////////////////////////////////// +// LLInspectRemoteObjectUtil +////////////////////////////////////////////////////////////////////////////// +void LLInspectRemoteObjectUtil::registerFloater() +{ + LLFloaterReg::add("inspect_remote_object", "inspect_remote_object.xml", + &LLFloaterReg::build); +} -- cgit v1.2.3