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/llfloaterprofile.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfloaterprofile.cpp') diff --git a/indra/newview/llfloaterprofile.cpp b/indra/newview/llfloaterprofile.cpp index 6ccdace6c5..33d5114c98 100644 --- a/indra/newview/llfloaterprofile.cpp +++ b/indra/newview/llfloaterprofile.cpp @@ -59,11 +59,11 @@ void LLFloaterProfile::onOpen(const LLSD& key) mNameCallbackConnection = LLAvatarNameCache::get(mAvatarId, boost::bind(&LLFloaterProfile::onAvatarNameCache, this, _1, _2)); } -BOOL LLFloaterProfile::postBuild() +bool LLFloaterProfile::postBuild() { mPanelProfile = findChild(PANEL_PROFILE_VIEW); - return TRUE; + return true; } void LLFloaterProfile::onClickCloseBtn(bool app_quitting) -- 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/llfloaterprofile.cpp | 340 ++++++++++++++++++------------------- 1 file changed, 170 insertions(+), 170 deletions(-) (limited to 'indra/newview/llfloaterprofile.cpp') diff --git a/indra/newview/llfloaterprofile.cpp b/indra/newview/llfloaterprofile.cpp index 53fa3f8e60..ee92785b6f 100644 --- a/indra/newview/llfloaterprofile.cpp +++ b/indra/newview/llfloaterprofile.cpp @@ -1,170 +1,170 @@ -/** - * @file llfloaterprofile.cpp - * @brief Avatar profile floater. - * - * $LicenseInfo:firstyear=2022&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2022, 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 "llfloaterprofile.h" - -#include "llagent.h" //gAgent -#include "llnotificationsutil.h" -#include "llpanelavatar.h" -#include "llpanelprofile.h" - -static const std::string PANEL_PROFILE_VIEW = "panel_profile_view"; - -LLFloaterProfile::LLFloaterProfile(const LLSD& key) - : LLFloater(key), - mAvatarId(key["id"].asUUID()), - mNameCallbackConnection() -{ - mDefaultRectForGroup = false; -} - -LLFloaterProfile::~LLFloaterProfile() -{ - if (mNameCallbackConnection.connected()) - { - mNameCallbackConnection.disconnect(); - } -} - -void LLFloaterProfile::onOpen(const LLSD& key) -{ - mPanelProfile->onOpen(key); - - // Update the avatar name. - mNameCallbackConnection = LLAvatarNameCache::get(mAvatarId, boost::bind(&LLFloaterProfile::onAvatarNameCache, this, _1, _2)); -} - -bool LLFloaterProfile::postBuild() -{ - mPanelProfile = findChild(PANEL_PROFILE_VIEW); - - return true; -} - -void LLFloaterProfile::onClickCloseBtn(bool app_quitting) -{ - if (!app_quitting) - { - if (mPanelProfile->hasUnpublishedClassifieds()) - { - LLNotificationsUtil::add("ProfileUnpublishedClassified", LLSD(), LLSD(), - boost::bind(&LLFloaterProfile::onUnsavedChangesCallback, this, _1, _2, false)); - } - else if (mPanelProfile->hasUnsavedChanges()) - { - LLNotificationsUtil::add("ProfileUnsavedChanges", LLSD(), LLSD(), - boost::bind(&LLFloaterProfile::onUnsavedChangesCallback, this, _1, _2, true)); - } - else - { - closeFloater(); - } - } - else - { - closeFloater(); - } -} - -void LLFloaterProfile::onUnsavedChangesCallback(const LLSD& notification, const LLSD& response, bool can_save) -{ - S32 option = LLNotificationsUtil::getSelectedOption(notification, response); - if (can_save) - { - // savable content - - if (option == 0) // Save - { - mPanelProfile->commitUnsavedChanges(); - closeFloater(); - } - if (option == 1) // Discard - { - closeFloater(); - } - // else cancel - } - else - { - // classifieds - - if (option == 0) // Ok - { - closeFloater(); - } - // else cancel - } - -} - -void LLFloaterProfile::createPick(const LLPickData &data) -{ - mPanelProfile->createPick(data); -} - -void LLFloaterProfile::showPick(const LLUUID& pick_id) -{ - mPanelProfile->showPick(pick_id); -} - -bool LLFloaterProfile::isPickTabSelected() -{ - return mPanelProfile->isPickTabSelected(); -} - -void LLFloaterProfile::refreshName() -{ - if (!mNameCallbackConnection.connected()) - { - mNameCallbackConnection = LLAvatarNameCache::get(mAvatarId, boost::bind(&LLFloaterProfile::onAvatarNameCache, this, _1, _2)); - } - - LLPanelProfileSecondLife *panel = findChild("panel_profile_secondlife"); - if (panel) - { - panel->refreshName(); - } -} - -void LLFloaterProfile::showClassified(const LLUUID& classified_id, bool edit) -{ - mPanelProfile->showClassified(classified_id, edit); -} - -void LLFloaterProfile::createClassified() -{ - mPanelProfile->createClassified(); -} - -void LLFloaterProfile::onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name) -{ - mNameCallbackConnection.disconnect(); - setTitle(av_name.getCompleteName()); -} - -// eof +/** + * @file llfloaterprofile.cpp + * @brief Avatar profile floater. + * + * $LicenseInfo:firstyear=2022&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2022, 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 "llfloaterprofile.h" + +#include "llagent.h" //gAgent +#include "llnotificationsutil.h" +#include "llpanelavatar.h" +#include "llpanelprofile.h" + +static const std::string PANEL_PROFILE_VIEW = "panel_profile_view"; + +LLFloaterProfile::LLFloaterProfile(const LLSD& key) + : LLFloater(key), + mAvatarId(key["id"].asUUID()), + mNameCallbackConnection() +{ + mDefaultRectForGroup = false; +} + +LLFloaterProfile::~LLFloaterProfile() +{ + if (mNameCallbackConnection.connected()) + { + mNameCallbackConnection.disconnect(); + } +} + +void LLFloaterProfile::onOpen(const LLSD& key) +{ + mPanelProfile->onOpen(key); + + // Update the avatar name. + mNameCallbackConnection = LLAvatarNameCache::get(mAvatarId, boost::bind(&LLFloaterProfile::onAvatarNameCache, this, _1, _2)); +} + +bool LLFloaterProfile::postBuild() +{ + mPanelProfile = findChild(PANEL_PROFILE_VIEW); + + return true; +} + +void LLFloaterProfile::onClickCloseBtn(bool app_quitting) +{ + if (!app_quitting) + { + if (mPanelProfile->hasUnpublishedClassifieds()) + { + LLNotificationsUtil::add("ProfileUnpublishedClassified", LLSD(), LLSD(), + boost::bind(&LLFloaterProfile::onUnsavedChangesCallback, this, _1, _2, false)); + } + else if (mPanelProfile->hasUnsavedChanges()) + { + LLNotificationsUtil::add("ProfileUnsavedChanges", LLSD(), LLSD(), + boost::bind(&LLFloaterProfile::onUnsavedChangesCallback, this, _1, _2, true)); + } + else + { + closeFloater(); + } + } + else + { + closeFloater(); + } +} + +void LLFloaterProfile::onUnsavedChangesCallback(const LLSD& notification, const LLSD& response, bool can_save) +{ + S32 option = LLNotificationsUtil::getSelectedOption(notification, response); + if (can_save) + { + // savable content + + if (option == 0) // Save + { + mPanelProfile->commitUnsavedChanges(); + closeFloater(); + } + if (option == 1) // Discard + { + closeFloater(); + } + // else cancel + } + else + { + // classifieds + + if (option == 0) // Ok + { + closeFloater(); + } + // else cancel + } + +} + +void LLFloaterProfile::createPick(const LLPickData &data) +{ + mPanelProfile->createPick(data); +} + +void LLFloaterProfile::showPick(const LLUUID& pick_id) +{ + mPanelProfile->showPick(pick_id); +} + +bool LLFloaterProfile::isPickTabSelected() +{ + return mPanelProfile->isPickTabSelected(); +} + +void LLFloaterProfile::refreshName() +{ + if (!mNameCallbackConnection.connected()) + { + mNameCallbackConnection = LLAvatarNameCache::get(mAvatarId, boost::bind(&LLFloaterProfile::onAvatarNameCache, this, _1, _2)); + } + + LLPanelProfileSecondLife *panel = findChild("panel_profile_secondlife"); + if (panel) + { + panel->refreshName(); + } +} + +void LLFloaterProfile::showClassified(const LLUUID& classified_id, bool edit) +{ + mPanelProfile->showClassified(classified_id, edit); +} + +void LLFloaterProfile::createClassified() +{ + mPanelProfile->createClassified(); +} + +void LLFloaterProfile::onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name) +{ + mNameCallbackConnection.disconnect(); + setTitle(av_name.getCompleteName()); +} + +// eof -- cgit v1.2.3