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

diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp
index 91f93067de..c7fa96edca 100644
--- a/indra/newview/llnotificationtiphandler.cpp
+++ b/indra/newview/llnotificationtiphandler.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llnotificationtiphandler.cpp
  * @brief Notification Handler Class for Notification Tips
  *
  * $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$
  */
@@ -42,14 +42,14 @@ using namespace LLNotificationsUI;
 
 //--------------------------------------------------------------------------
 LLTipHandler::LLTipHandler()
-:	LLSystemNotificationHandler("NotificationTips", "notifytip")
+:   LLSystemNotificationHandler("NotificationTips", "notifytip")
 {
-	// Getting a Channel for our notifications
-	LLScreenChannel* channel = LLChannelManager::getInstance()->createNotificationChannel();
-	if(channel)
-	{
-		mChannel = channel->getHandle();
-	}
+    // Getting a Channel for our notifications
+    LLScreenChannel* channel = LLChannelManager::getInstance()->createNotificationChannel();
+    if(channel)
+    {
+        mChannel = channel->getHandle();
+    }
 }
 
 //--------------------------------------------------------------------------
@@ -60,78 +60,77 @@ LLTipHandler::~LLTipHandler()
 //--------------------------------------------------------------------------
 void LLTipHandler::initChannel()
 {
-	S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); 
-	S32 channel_width = gSavedSettings.getS32("NotifyBoxWidth");
-	mChannel.get()->init(channel_right_bound - channel_width, channel_right_bound);
+    S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().mRight - gSavedSettings.getS32("NotificationChannelRightMargin");
+    mChannel.get()->init(channel_right_bound - NOTIFY_BOX_WIDTH, channel_right_bound);
 }
 
 //--------------------------------------------------------------------------
 bool LLTipHandler::processNotification(const LLNotificationPtr& notification, bool should_log)
 {
-	if(mChannel.isDead())
-	{
-		return false;
-	}
-
-	// arrange a channel on a screen
-	if(!mChannel.get()->getVisible())
-	{
-		initChannel();
-	}
-
-		// archive message in nearby chat
-	if (notification->canLogToChat())
-	{
-		LLHandlerUtil::logToNearbyChat(notification, CHAT_SOURCE_SYSTEM);
-	}
-
-	std::string session_name = notification->getPayload()["SESSION_NAME"];
-	const std::string name = LLHandlerUtil::getSubstitutionOriginalName(notification);
-	if (session_name.empty())
-	{
-		session_name = name;
-	}
-	LLUUID from_id = notification->getPayload()["from_id"];
-	if (notification->canLogToIM())
-	{
-		LLHandlerUtil::logToIM(IM_NOTHING_SPECIAL, session_name, name,
-				notification->getMessage(), from_id, from_id);
-	}
-
-	if (notification->canLogToIM() && notification->hasFormElements())
-	{
-		LLHandlerUtil::spawnIMSession(name, from_id);
-	}
-
-	if (notification->canLogToIM() && LLHandlerUtil::isIMFloaterOpened(notification))
-	{
-		return false;
-	}
-
-	LLToastPanel* notify_box = LLToastPanel::buidPanelFromNotification(notification);
-
-	LLToast::Params p;
-	p.notif_id = notification->getID();
-	p.notification = notification;
-	p.panel = notify_box;
-	p.is_tip = true;
-	p.can_be_stored = false;
-
-	LLDate cur_time = LLDate::now();
-	LLDate exp_time = notification->getExpiration();
-	if (exp_time > cur_time)
-	{
-		// we have non-default expiration time - keep visible until expires
-		p.lifetime_secs = exp_time.secondsSinceEpoch() - cur_time.secondsSinceEpoch();
-	}
-	else
-	{
-		// use default time
-		p.lifetime_secs = gSavedSettings.getS32("NotificationTipToastLifeTime");
-	}
-
-	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();
+    }
+
+        // archive message in nearby chat
+    if (notification->canLogToChat())
+    {
+        LLHandlerUtil::logToNearbyChat(notification, CHAT_SOURCE_SYSTEM);
+    }
+
+    std::string session_name = notification->getPayload()["SESSION_NAME"];
+    const std::string name = LLHandlerUtil::getSubstitutionOriginalName(notification);
+    if (session_name.empty())
+    {
+        session_name = name;
+    }
+    LLUUID from_id = notification->getPayload()["from_id"];
+    if (notification->canLogToIM())
+    {
+        LLHandlerUtil::logToIM(IM_NOTHING_SPECIAL, session_name, name,
+                notification->getMessage(), from_id, from_id);
+    }
+
+    if (notification->canLogToIM() && notification->hasFormElements())
+    {
+        LLHandlerUtil::spawnIMSession(name, from_id);
+    }
+
+    if (notification->canLogToIM() && LLHandlerUtil::isIMFloaterOpened(notification))
+    {
+        return false;
+    }
+
+    LLToastPanel* notify_box = LLToastPanel::buidPanelFromNotification(notification);
+
+    LLToast::Params p;
+    p.notif_id = notification->getID();
+    p.notification = notification;
+    p.panel = notify_box;
+    p.is_tip = true;
+    p.can_be_stored = false;
+
+    LLDate cur_time = LLDate::now();
+    LLDate exp_time = notification->getExpiration();
+    if (exp_time > cur_time)
+    {
+        // we have non-default expiration time - keep visible until expires
+        p.lifetime_secs = exp_time.secondsSinceEpoch() - cur_time.secondsSinceEpoch();
+    }
+    else
+    {
+        // use default time
+        p.lifetime_secs = gSavedSettings.getS32("NotificationTipToastLifeTime");
+    }
+
+    LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get());
+    if(channel)
+        channel->addToast(p);
+    return false;
 }