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

diff --git a/indra/newview/llfirstuse.cpp b/indra/newview/llfirstuse.cpp
index 43440bd6c7..436f1a5c64 100644
--- a/indra/newview/llfirstuse.cpp
+++ b/indra/newview/llfirstuse.cpp
@@ -1,176 +1,176 @@
-/** 
- * @file llfirstuse.cpp
- * @brief Methods that spawn "first-use" dialogs
- *
- * $LicenseInfo:firstyear=2003&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"
-
-#include "llfirstuse.h"
-
-// library includes
-#include "indra_constants.h"
-#include "llnotifications.h"
-
-// viewer includes
-#include "llagent.h"	// for gAgent.inPrelude()
-#include "llviewercontrol.h"
-#include "llui.h"
-#include "llappviewer.h"
-#include "lltracker.h"
-
-
-// static
-void LLFirstUse::otherAvatarChatFirst(bool enable)
-{
-	firstUseNotification("FirstOtherChatBeforeUser", enable, "HintChat", LLSD(), LLSD().with("target", "nearby_chat").with("direction", "top_right").with("distance", 24));
-}
-
-// static
-void LLFirstUse::speak(bool enable)
-{
-	firstUseNotification("FirstSpeak", enable, "HintSpeak", LLSD(), LLSD().with("target", "speak_btn").with("direction", "top"));
-}
-
-// static
-void LLFirstUse::sit(bool enable)
-{
-	firstUseNotification("FirstSit", enable, "HintSit", LLSD(), LLSD().with("target", "stand_btn").with("direction", "top"));
-}
-
-// static
-void LLFirstUse::newInventory(bool enable)
-{
-	// turning this off until bug EXP-62 can be fixed (inventory hint appears for new users when their initial inventory is acquired)
-	// firstUseNotification("FirstInventoryOffer", enable, "HintInventory", LLSD(), LLSD().with("target", "inventory_btn").with("direction", "left"));
-}
-
-// first clean starts at 3 AM
-const S32 SANDBOX_FIRST_CLEAN_HOUR = 3;
-// clean every <n> hours
-const S32 SANDBOX_CLEAN_FREQ = 12;
-
-// static
-void LLFirstUse::useSandbox()
-{
-	firstUseNotification("FirstSandbox", true, "FirstSandbox", LLSD().with("HOURS", SANDBOX_CLEAN_FREQ).with("TIME", SANDBOX_FIRST_CLEAN_HOUR));
-}
-
-// static
-void LLFirstUse::notUsingDestinationGuide(bool enable)
-{
-	// not doing this yet
-	firstUseNotification("FirstNotUseDestinationGuide", enable, "HintDestinationGuide", LLSD(), LLSD().with("target", "dest_guide_btn").with("direction", "top"));
-}
-
-// static
-void LLFirstUse::notUsingSidePanel(bool enable)
-{
-	// not doing this yet
-	//firstUseNotification("FirstNotUseSidePanel", enable, "HintSidePanel", LLSD(), LLSD().with("target", "side_panel_btn").with("direction", "left"));
-}
-
-// static
-void LLFirstUse::notMoving(bool enable)
-{
-	// fire off 2 notifications and rely on filtering to select the relevant one
-	firstUseNotification("FirstNotMoving", enable, "HintMove", LLSD(), LLSD().with("target", "move_btn").with("direction", "top"));
-	firstUseNotification("FirstNotMoving", enable, "HintMoveClick", LLSD(), LLSD()
-		.with("target", "nav_bar")
-		.with("direction", "bottom")
-		.with("hint_image", "click_to_move.png")
-		.with("up_arrow", ""));
-}
-
-// static
-void LLFirstUse::viewPopup(bool enable)
-{
-//	firstUseNotification("FirstViewPopup", enable, "HintView", LLSD(), LLSD().with("target", "view_popup").with("direction", "right"));
-}
-
-// static
-void LLFirstUse::setDisplayName(bool enable)
-{
-	firstUseNotification("FirstDisplayName", enable, "HintDisplayName", LLSD(), LLSD().with("target", "set_display_name").with("direction", "left"));
-}
-
-// static
-void LLFirstUse::receiveLindens(bool enable)
-{
-	firstUseNotification("FirstReceiveLindens", enable, "HintLindenDollar", LLSD(), LLSD().with("target", "linden_balance").with("direction", "bottom"));
-}
-
-
-//static 
-void LLFirstUse::firstUseNotification(const std::string& control_var, bool enable, const std::string& notification_name, LLSD args, LLSD payload)
-{
-	init();
-
-	if (enable)
-	{
-		if (gSavedSettings.getBOOL("EnableUIHints"))
-		{
-			LL_DEBUGS("LLFirstUse") << "Trigger first use notification " << notification_name << LL_ENDL;
-
-			// if notification doesn't already exist and this notification hasn't been disabled...
-			if (gWarningSettings.getBOOL(control_var))
-			{ // create new notification
-				LLNotifications::instance().add(LLNotification::Params().name(notification_name).substitutions(args).payload(payload.with("control_var", control_var)));
-			}
-		}
-	}	
-	else
-	{
-		LL_DEBUGS("LLFirstUse") << "Disabling first use notification " << notification_name << LL_ENDL;
-		LLNotifications::instance().cancelByName(notification_name);
-		// redundantly clear settings var here, in case there are no notifications to cancel
-		gWarningSettings.setBOOL(control_var, false);
-	}
-
-}
-
-// static
-void LLFirstUse::init()
-{
-	static bool initialized = false;
-	if (!initialized)
-	{
-		LLNotifications::instance().getChannel("Hints")->connectChanged(&processNotification);
-	}
-	initialized = true;
-}
-
-//static 
-bool LLFirstUse::processNotification(const LLSD& notify)
-{
-	if (notify["sigtype"].asString() == "delete")
-	{
-		LLNotificationPtr notification = LLNotifications::instance().find(notify["id"].asUUID());
-		if (notification)
-		{
-			// disable any future notifications
-			gWarningSettings.setBOOL((std::string)notification->getPayload()["control_var"], false);
-		}
-	}
-	return false;
-}
+/**

+ * @file llfirstuse.cpp

+ * @brief Methods that spawn "first-use" dialogs

+ *

+ * $LicenseInfo:firstyear=2003&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"

+

+#include "llfirstuse.h"

+

+// library includes

+#include "indra_constants.h"

+#include "llnotifications.h"

+

+// viewer includes

+#include "llagent.h"    // for gAgent.inPrelude()

+#include "llviewercontrol.h"

+#include "llui.h"

+#include "llappviewer.h"

+#include "lltracker.h"

+

+

+// static

+void LLFirstUse::otherAvatarChatFirst(bool enable)

+{

+    firstUseNotification("FirstOtherChatBeforeUser", enable, "HintChat", LLSD(), LLSD().with("target", "nearby_chat").with("direction", "top_right").with("distance", 24));

+}

+

+// static

+void LLFirstUse::speak(bool enable)

+{

+    firstUseNotification("FirstSpeak", enable, "HintSpeak", LLSD(), LLSD().with("target", "speak_btn").with("direction", "top"));

+}

+

+// static

+void LLFirstUse::sit(bool enable)

+{

+    firstUseNotification("FirstSit", enable, "HintSit", LLSD(), LLSD().with("target", "stand_btn").with("direction", "top"));

+}

+

+// static

+void LLFirstUse::newInventory(bool enable)

+{

+    // turning this off until bug EXP-62 can be fixed (inventory hint appears for new users when their initial inventory is acquired)

+    // firstUseNotification("FirstInventoryOffer", enable, "HintInventory", LLSD(), LLSD().with("target", "inventory_btn").with("direction", "left"));

+}

+

+// first clean starts at 3 AM

+const S32 SANDBOX_FIRST_CLEAN_HOUR = 3;

+// clean every <n> hours

+const S32 SANDBOX_CLEAN_FREQ = 12;

+

+// static

+void LLFirstUse::useSandbox()

+{

+    firstUseNotification("FirstSandbox", true, "FirstSandbox", LLSD().with("HOURS", SANDBOX_CLEAN_FREQ).with("TIME", SANDBOX_FIRST_CLEAN_HOUR));

+}

+

+// static

+void LLFirstUse::notUsingDestinationGuide(bool enable)

+{

+    // not doing this yet

+    firstUseNotification("FirstNotUseDestinationGuide", enable, "HintDestinationGuide", LLSD(), LLSD().with("target", "dest_guide_btn").with("direction", "top"));

+}

+

+// static

+void LLFirstUse::notUsingSidePanel(bool enable)

+{

+    // not doing this yet

+    //firstUseNotification("FirstNotUseSidePanel", enable, "HintSidePanel", LLSD(), LLSD().with("target", "side_panel_btn").with("direction", "left"));

+}

+

+// static

+void LLFirstUse::notMoving(bool enable)

+{

+    // fire off 2 notifications and rely on filtering to select the relevant one

+    firstUseNotification("FirstNotMoving", enable, "HintMove", LLSD(), LLSD().with("target", "move_btn").with("direction", "top"));

+    firstUseNotification("FirstNotMoving", enable, "HintMoveClick", LLSD(), LLSD()

+        .with("target", "nav_bar")

+        .with("direction", "bottom")

+        .with("hint_image", "click_to_move.png")

+        .with("up_arrow", ""));

+}

+

+// static

+void LLFirstUse::viewPopup(bool enable)

+{

+//  firstUseNotification("FirstViewPopup", enable, "HintView", LLSD(), LLSD().with("target", "view_popup").with("direction", "right"));

+}

+

+// static

+void LLFirstUse::setDisplayName(bool enable)

+{

+    firstUseNotification("FirstDisplayName", enable, "HintDisplayName", LLSD(), LLSD().with("target", "set_display_name").with("direction", "left"));

+}

+

+// static

+void LLFirstUse::receiveLindens(bool enable)

+{

+    firstUseNotification("FirstReceiveLindens", enable, "HintLindenDollar", LLSD(), LLSD().with("target", "linden_balance").with("direction", "bottom"));

+}

+

+

+//static

+void LLFirstUse::firstUseNotification(const std::string& control_var, bool enable, const std::string& notification_name, LLSD args, LLSD payload)

+{

+    init();

+

+    if (enable)

+    {

+        if (gSavedSettings.getBOOL("EnableUIHints"))

+        {

+            LL_DEBUGS("LLFirstUse") << "Trigger first use notification " << notification_name << LL_ENDL;

+

+            // if notification doesn't already exist and this notification hasn't been disabled...

+            if (gWarningSettings.getBOOL(control_var))

+            { // create new notification

+                LLNotifications::instance().add(LLNotification::Params().name(notification_name).substitutions(args).payload(payload.with("control_var", control_var)));

+            }

+        }

+    }

+    else

+    {

+        LL_DEBUGS("LLFirstUse") << "Disabling first use notification " << notification_name << LL_ENDL;

+        LLNotifications::instance().cancelByName(notification_name);

+        // redundantly clear settings var here, in case there are no notifications to cancel

+        gWarningSettings.setBOOL(control_var, false);

+    }

+

+}

+

+// static

+void LLFirstUse::init()

+{

+    static bool initialized = false;

+    if (!initialized)

+    {

+        LLNotifications::instance().getChannel("Hints")->connectChanged(&processNotification);

+    }

+    initialized = true;

+}

+

+//static

+bool LLFirstUse::processNotification(const LLSD& notify)

+{

+    if (notify["sigtype"].asString() == "delete")

+    {

+        LLNotificationPtr notification = LLNotifications::instance().find(notify["id"].asUUID());

+        if (notification)

+        {

+            // disable any future notifications

+            gWarningSettings.setBOOL((std::string)notification->getPayload()["control_var"], false);

+        }

+    }

+    return false;

+}