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, 206 insertions, 207 deletions

diff --git a/indra/newview/llnotificationofferhandler.cpp b/indra/newview/llnotificationofferhandler.cpp
index 578af50ed8..69385347bb 100644
--- a/indra/newview/llnotificationofferhandler.cpp
+++ b/indra/newview/llnotificationofferhandler.cpp
@@ -1,207 +1,206 @@
-/**
- * @file llnotificationofferhandler.cpp
- * @brief Notification Handler Class for Simple Notifications and 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$
- */
-
-
-#include "llviewerprecompiledheaders.h" // must be first include
-
-#include "llnotificationhandler.h"
-#include "lltoastnotifypanel.h"
-#include "llviewercontrol.h"
-#include "llviewerwindow.h"
-#include "llnotificationmanager.h"
-#include "llnotifications.h"
-#include "llscriptfloater.h"
-#include "llimview.h"
-#include "llnotificationsutil.h"
-
-#include <boost/regex.hpp>
-
-using namespace LLNotificationsUI;
-
-//--------------------------------------------------------------------------
-LLOfferHandler::LLOfferHandler()
-:	LLCommunicationNotificationHandler("Offer", "offer")
-{
-	// Getting a Channel for our notifications
-	LLScreenChannel* channel = LLChannelManager::getInstance()->createNotificationChannel();
-	if(channel)
-	{
-		channel->setControlHovering(true);
-		mChannel = channel->getHandle();
-	}
-}
-
-//--------------------------------------------------------------------------
-LLOfferHandler::~LLOfferHandler()
-{
-}
-
-//--------------------------------------------------------------------------
-void LLOfferHandler::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);
-}
-
-//--------------------------------------------------------------------------
-bool LLOfferHandler::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->getPayload().has("give_inventory_notification") &&
-		!notification->getPayload()["give_inventory_notification"].asBoolean())
-	{
-		// This is an original inventory offer, so add a script floater
-		LLScriptFloaterManager::instance().onAddNotification(notification->getID());
-	}
-	else
-	{
-		bool add_notif_to_im = notification->canLogToIM() && notification->hasFormElements();
-
-		if (add_notif_to_im)
-		{
-			const std::string name = LLHandlerUtil::getSubstitutionName(notification);
-
-			LLUUID from_id = notification->getPayload()["from_id"];
-
-			if (!notification->isDND())
-			{
-				//Will not play a notification sound for inventory and teleport offer based upon chat preference
-				bool playSound = (notification->getName() == "UserGiveItem"
-								  && gSavedSettings.getBOOL("PlaySoundInventoryOffer"))
-								 || ((notification->getName() == "TeleportOffered"
-								     || notification->getName() == "TeleportOffered_MaturityExceeded"
-								     || notification->getName() == "TeleportOffered_MaturityBlocked")
-								    && gSavedSettings.getBOOL("PlaySoundTeleportOffer"));
-
-				if (playSound)
-				{
-					notification->playSound();
-				}
-			}
-
-			LLHandlerUtil::spawnIMSession(name, from_id);
-			LLHandlerUtil::addNotifPanelToIM(notification);
-
-		}
-
-		if (!notification->canShowToast())
-		{
-			LLNotificationsUtil::cancel(notification);
-		}
-		else if(!notification->canLogToIM() || !LLHandlerUtil::isIMFloaterOpened(notification))
-		{
-			LLToastNotifyPanel* notify_box = new LLToastNotifyPanel(notification);
-			LLToast::Params p;
-			p.notif_id = notification->getID();
-			p.notification = notification;
-			p.panel = notify_box;
-			// we not save offer notifications to the syswell floater that should be added to the IM floater
-			p.can_be_stored = !add_notif_to_im;
-			p.force_show = notification->getOfferFromAgent();
-			p.can_fade = notification->canFadeToast();
-
-			LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get());
-			if(channel)
-				channel->addToast(p);
-
-		}
-
-		if (notification->canLogToIM())
-		{
-			// log only to file if notif panel can be embedded to IM and IM is opened
-			bool file_only = add_notif_to_im && LLHandlerUtil::isIMFloaterOpened(notification);
-			if ((notification->getName() == "TeleportOffered"
-				|| notification->getName() == "TeleportOffered_MaturityExceeded"
-				|| notification->getName() == "TeleportOffered_MaturityBlocked"))
-			{
-				boost::regex r("<icon\\s*>\\s*([^<]*)?\\s*</icon\\s*>( - )?",
-					boost::regex::perl|boost::regex::icase);
-				std::string stripped_msg = boost::regex_replace(notification->getMessage(), r, "");
-				LLHandlerUtil::logToIMP2P(notification->getPayload()["from_id"], stripped_msg,file_only);
-			}
-			else
-			{
-				LLHandlerUtil::logToIMP2P(notification, file_only);
-			}
-		}
-	}
-
-	return false;
-}
-
-/*virtual*/ void LLOfferHandler::onChange(LLNotificationPtr p)
-{
-	auto panelp = LLToastNotifyPanel::getInstance(p->getID());
-	if (panelp)
-	{
-		//
-		// HACK: if we're dealing with a notification embedded in IM, update it
-		// otherwise remove its toast
-		//
-		if (dynamic_cast<LLIMToastNotifyPanel*>(panelp.get()))
-		{
-			panelp->updateNotification();
-		}
-		else
-		{
-			// if notification has changed, hide it
-			mChannel.get()->removeToastByNotificationID(p->getID());
-		}
-	}
-}
-
-
-/*virtual*/ void LLOfferHandler::onDelete(LLNotificationPtr notification)
-{
-	if( notification->getPayload().has("give_inventory_notification")
-		&& !notification->getPayload()["give_inventory_notification"] )
-	{
-		// Remove original inventory offer script floater
-		LLScriptFloaterManager::instance().onRemoveNotification(notification->getID());
-	}
-	else
-	{
-		if (notification->canLogToIM() 
-			&& notification->hasFormElements()
-			&& !LLHandlerUtil::isIMFloaterOpened(notification))
-		{
-			LLHandlerUtil::decIMMesageCounter(notification);
-		}
-		mChannel.get()->removeToastByNotificationID(notification->getID());
-	}
-}
-
+/**

+ * @file llnotificationofferhandler.cpp

+ * @brief Notification Handler Class for Simple Notifications and 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$

+ */

+

+

+#include "llviewerprecompiledheaders.h" // must be first include

+

+#include "llnotificationhandler.h"

+#include "lltoastnotifypanel.h"

+#include "llviewercontrol.h"

+#include "llviewerwindow.h"

+#include "llnotificationmanager.h"

+#include "llnotifications.h"

+#include "llscriptfloater.h"

+#include "llimview.h"

+#include "llnotificationsutil.h"

+

+#include <boost/regex.hpp>

+

+using namespace LLNotificationsUI;

+

+//--------------------------------------------------------------------------

+LLOfferHandler::LLOfferHandler()

+:   LLCommunicationNotificationHandler("Offer", "offer")

+{

+    // Getting a Channel for our notifications

+    LLScreenChannel* channel = LLChannelManager::getInstance()->createNotificationChannel();

+    if(channel)

+    {

+        channel->setControlHovering(true);

+        mChannel = channel->getHandle();

+    }

+}

+

+//--------------------------------------------------------------------------

+LLOfferHandler::~LLOfferHandler()

+{

+}

+

+//--------------------------------------------------------------------------

+void LLOfferHandler::initChannel()

+{

+    S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().mRight - gSavedSettings.getS32("NotificationChannelRightMargin");

+    mChannel.get()->init(channel_right_bound - NOTIFY_BOX_WIDTH, channel_right_bound);

+}

+

+//--------------------------------------------------------------------------

+bool LLOfferHandler::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->getPayload().has("give_inventory_notification") &&

+        !notification->getPayload()["give_inventory_notification"].asBoolean())

+    {

+        // This is an original inventory offer, so add a script floater

+        LLScriptFloaterManager::instance().onAddNotification(notification->getID());

+    }

+    else

+    {

+        bool add_notif_to_im = notification->canLogToIM() && notification->hasFormElements();

+

+        if (add_notif_to_im)

+        {

+            const std::string name = LLHandlerUtil::getSubstitutionName(notification);

+

+            LLUUID from_id = notification->getPayload()["from_id"];

+

+            if (!notification->isDND())

+            {

+                //Will not play a notification sound for inventory and teleport offer based upon chat preference

+                bool playSound = (notification->getName() == "UserGiveItem"

+                                  && gSavedSettings.getBOOL("PlaySoundInventoryOffer"))

+                                 || ((notification->getName() == "TeleportOffered"

+                                     || notification->getName() == "TeleportOffered_MaturityExceeded"

+                                     || notification->getName() == "TeleportOffered_MaturityBlocked")

+                                    && gSavedSettings.getBOOL("PlaySoundTeleportOffer"));

+

+                if (playSound)

+                {

+                    notification->playSound();

+                }

+            }

+

+            LLHandlerUtil::spawnIMSession(name, from_id);

+            LLHandlerUtil::addNotifPanelToIM(notification);

+

+        }

+

+        if (!notification->canShowToast())

+        {

+            LLNotificationsUtil::cancel(notification);

+        }

+        else if(!notification->canLogToIM() || !LLHandlerUtil::isIMFloaterOpened(notification))

+        {

+            LLToastNotifyPanel* notify_box = new LLToastNotifyPanel(notification);

+            LLToast::Params p;

+            p.notif_id = notification->getID();

+            p.notification = notification;

+            p.panel = notify_box;

+            // we not save offer notifications to the syswell floater that should be added to the IM floater

+            p.can_be_stored = !add_notif_to_im;

+            p.force_show = notification->getOfferFromAgent();

+            p.can_fade = notification->canFadeToast();

+

+            LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get());

+            if(channel)

+                channel->addToast(p);

+

+        }

+

+        if (notification->canLogToIM())

+        {

+            // log only to file if notif panel can be embedded to IM and IM is opened

+            bool file_only = add_notif_to_im && LLHandlerUtil::isIMFloaterOpened(notification);

+            if ((notification->getName() == "TeleportOffered"

+                || notification->getName() == "TeleportOffered_MaturityExceeded"

+                || notification->getName() == "TeleportOffered_MaturityBlocked"))

+            {

+                boost::regex r("<icon\\s*>\\s*([^<]*)?\\s*</icon\\s*>( - )?",

+                    boost::regex::perl|boost::regex::icase);

+                std::string stripped_msg = boost::regex_replace(notification->getMessage(), r, "");

+                LLHandlerUtil::logToIMP2P(notification->getPayload()["from_id"], stripped_msg,file_only);

+            }

+            else

+            {

+                LLHandlerUtil::logToIMP2P(notification, file_only);

+            }

+        }

+    }

+

+    return false;

+}

+

+/*virtual*/ void LLOfferHandler::onChange(LLNotificationPtr p)

+{

+    auto panelp = LLToastNotifyPanel::getInstance(p->getID());

+    if (panelp)

+    {

+        //

+        // HACK: if we're dealing with a notification embedded in IM, update it

+        // otherwise remove its toast

+        //

+        if (dynamic_cast<LLIMToastNotifyPanel*>(panelp.get()))

+        {

+            panelp->updateNotification();

+        }

+        else

+        {

+            // if notification has changed, hide it

+            mChannel.get()->removeToastByNotificationID(p->getID());

+        }

+    }

+}

+

+

+/*virtual*/ void LLOfferHandler::onDelete(LLNotificationPtr notification)

+{

+    if( notification->getPayload().has("give_inventory_notification")

+        && !notification->getPayload()["give_inventory_notification"] )

+    {

+        // Remove original inventory offer script floater

+        LLScriptFloaterManager::instance().onRemoveNotification(notification->getID());

+    }

+    else

+    {

+        if (notification->canLogToIM()

+            && notification->hasFormElements()

+            && !LLHandlerUtil::isIMFloaterOpened(notification))

+        {

+            LLHandlerUtil::decIMMesageCounter(notification);

+        }

+        mChannel.get()->removeToastByNotificationID(notification->getID());

+    }

+}

+