Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A

# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp

1 files changed, 170 insertions, 170 deletions

diff --git a/indra/newview/llfloaterprofile.cpp b/indra/newview/llfloaterprofile.cpp
index 33d5114c98..53fa3f8e60 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<LLPanelProfile>(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<LLPanelProfileSecondLife>("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<LLPanelProfile>(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<LLPanelProfileSecondLife>("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