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, 81 insertions, 81 deletions

diff --git a/indra/newview/llnotificationalerthandler.cpp b/indra/newview/llnotificationalerthandler.cpp
index 90b9cdc133..3c4ca536e3 100644
--- a/indra/newview/llnotificationalerthandler.cpp
+++ b/indra/newview/llnotificationalerthandler.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llnotificationalerthandler.cpp
  * @brief Notification Handler Class for Alert Notifications
  *
  * $LicenseInfo:firstyear=2000&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$
  */
@@ -41,19 +41,19 @@
 using namespace LLNotificationsUI;
 
 //--------------------------------------------------------------------------
-LLAlertHandler::LLAlertHandler(const std::string& name, const std::string& notification_type, bool is_modal) 
-:	LLSystemNotificationHandler(name, notification_type),
-	mIsModal(is_modal)
+LLAlertHandler::LLAlertHandler(const std::string& name, const std::string& notification_type, bool is_modal)
+:   LLSystemNotificationHandler(name, notification_type),
+    mIsModal(is_modal)
 {
-	LLScreenChannelBase::Params p;
-	p.id = LLUUID(gSavedSettings.getString("AlertChannelUUID"));
-	p.display_toasts_always = true;
-	p.toast_align = NA_CENTRE;
-	p.channel_align = CA_CENTRE;
-
-	// Getting a Channel for our notifications
-	mChannel = LLChannelManager::getInstance()->getChannel(p)->getHandle();
-	mChannel.get()->setCanStoreToasts(false);
+    LLScreenChannelBase::Params p;
+    p.id = ALERT_CHANNEL_UUID;
+    p.display_toasts_always = true;
+    p.toast_align = NA_CENTRE;
+    p.channel_align = CA_CENTRE;
+
+    // Getting a Channel for our notifications
+    mChannel = LLChannelManager::getInstance()->getChannel(p)->getHandle();
+    mChannel.get()->setCanStoreToasts(false);
 }
 
 //--------------------------------------------------------------------------
@@ -64,88 +64,88 @@ LLAlertHandler::~LLAlertHandler()
 //--------------------------------------------------------------------------
 void LLAlertHandler::initChannel()
 {
-	S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().getWidth() / 2;
-	mChannel.get()->init(channel_right_bound, channel_right_bound);
+    S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().getWidth() / 2;
+    mChannel.get()->init(channel_right_bound, channel_right_bound);
 }
 
 //--------------------------------------------------------------------------
 bool LLAlertHandler::processNotification(const LLNotificationPtr& notification, bool should_log)
 {
-	if(mChannel.isDead())
-	{
-		return false;
-	}
-
-	// arrange a channel on a screen
-	if(!mChannel.get()->getVisible())
-	{
-		initChannel();
-	}
-
-	if (notification->canLogToIM() && notification->hasFormElements())
-	{
-		const std::string name = LLHandlerUtil::getSubstitutionName(notification);
-
-		LLUUID from_id = notification->getPayload()["from_id"];
-
-		// firstly create session...
-		LLHandlerUtil::spawnIMSession(name, from_id);
-
-		// ...then log message to have IM Well notified about new message
-		LLHandlerUtil::logToIMP2P(notification);
-	}
-
-	LLToastAlertPanel* alert_dialog = new LLToastAlertPanel(notification, mIsModal);
-	LLToast::Params p;
-	p.notif_id = notification->getID();
-	p.notification = notification;
-	p.panel = dynamic_cast<LLToastPanel*>(alert_dialog);
-	p.enable_hide_btn = false;
-	p.can_fade = false;
-	p.is_modal = mIsModal;
-	p.on_delete_toast = boost::bind(&LLAlertHandler::onDeleteToast, this, _1);
-
-	// Show alert in middle of progress view (during teleport) (EXT-1093)
-	LLProgressView* progress = gViewerWindow->getProgressView();
-	LLRect rc = progress && progress->getVisible() ? progress->getRect() : gViewerWindow->getWorldViewRectScaled();
-	mChannel.get()->updatePositionAndSize(rc);
-
-	LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get());
-	if(channel)
-		channel->addToast(p);
-	
-	return false;
+    if(mChannel.isDead())
+    {
+        return false;
+    }
+
+    // arrange a channel on a screen
+    if(!mChannel.get()->getVisible())
+    {
+        initChannel();
+    }
+
+    if (notification->canLogToIM() && notification->hasFormElements())
+    {
+        const std::string name = LLHandlerUtil::getSubstitutionName(notification);
+
+        LLUUID from_id = notification->getPayload()["from_id"];
+
+        // firstly create session...
+        LLHandlerUtil::spawnIMSession(name, from_id);
+
+        // ...then log message to have IM Well notified about new message
+        LLHandlerUtil::logToIMP2P(notification);
+    }
+
+    LLToastAlertPanel* alert_dialog = new LLToastAlertPanel(notification, mIsModal);
+    LLToast::Params p;
+    p.notif_id = notification->getID();
+    p.notification = notification;
+    p.panel = dynamic_cast<LLToastPanel*>(alert_dialog);
+    p.enable_hide_btn = false;
+    p.can_fade = false;
+    p.is_modal = mIsModal;
+    p.on_delete_toast = boost::bind(&LLAlertHandler::onDeleteToast, this, _1);
+
+    // Show alert in middle of progress view (during teleport) (EXT-1093)
+    LLProgressView* progress = gViewerWindow->getProgressView();
+    LLRect rc = progress && progress->getVisible() ? progress->getRect() : gViewerWindow->getWorldViewRectScaled();
+    mChannel.get()->updatePositionAndSize(rc);
+
+    LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get());
+    if(channel)
+        channel->addToast(p);
+
+    return false;
 }
 
 void LLAlertHandler::onChange( LLNotificationPtr notification )
 {
-	LLToastAlertPanel* alert_dialog = new LLToastAlertPanel(notification, mIsModal);
-	LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get());
-	if(channel)
-		channel->modifyToastByNotificationID(notification->getID(), (LLToastPanel*)alert_dialog);
+    LLToastAlertPanel* alert_dialog = new LLToastAlertPanel(notification, mIsModal);
+    LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get());
+    if(channel)
+        channel->modifyToastByNotificationID(notification->getID(), (LLToastPanel*)alert_dialog);
 }
 
 //--------------------------------------------------------------------------
 LLViewerAlertHandler::LLViewerAlertHandler(const std::string& name, const std::string& notification_type)
-	: LLSystemNotificationHandler(name, notification_type)
+    : LLSystemNotificationHandler(name, notification_type)
 {
 }
 
 bool LLViewerAlertHandler::processNotification(const LLNotificationPtr& p, bool should_log)
 {
-	if (gHeadlessClient)
-	{
-		LL_INFOS("LLViewerAlertHandler") << "Alert: " << p->getName() << LL_ENDL;
-	}
-
-	// If we're in mouselook, the mouse is hidden and so the user can't click 
-	// the dialog buttons.  In that case, change to First Person instead.
-	if( gAgentCamera.cameraMouselook() )
-	{
-		gAgentCamera.changeCameraToDefault();
-	}
-
-	return false;
+    if (gHeadlessClient)
+    {
+        LL_INFOS("LLViewerAlertHandler") << "Alert: " << p->getName() << LL_ENDL;
+    }
+
+    // If we're in mouselook, the mouse is hidden and so the user can't click
+    // the dialog buttons.  In that case, change to First Person instead.
+    if( gAgentCamera.cameraMouselook() )
+    {
+        gAgentCamera.changeCameraToDefault();
+    }
+
+    return false;
 }