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

diff --git a/indra/newview/llfloaterscriptdebug.cpp b/indra/newview/llfloaterscriptdebug.cpp
index b31f7c3580..0449ea3500 100644
--- a/indra/newview/llfloaterscriptdebug.cpp
+++ b/indra/newview/llfloaterscriptdebug.cpp
@@ -1,217 +1,217 @@
-/** 
- * @file llfloaterscriptdebug.cpp
- * @brief Chat window for showing script errors and warnings
- *
- * $LicenseInfo:firstyear=2006&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 "llfloaterscriptdebug.h"
-
-#include "llfloaterreg.h"
-#include "lluictrlfactory.h"
-#include "llfontgl.h"
-#include "llrect.h"
-#include "llerror.h"
-#include "llstring.h"
-#include "llvoavatarself.h"
-#include "message.h"
-
-// project include
-#include "llviewertexteditor.h"
-#include "llviewercontrol.h"
-#include "llviewerobjectlist.h"
-#include "llviewertexturelist.h"
-
-//
-// Statics
-//
-
-//
-// Member Functions
-//
-LLFloaterScriptDebug::LLFloaterScriptDebug(const LLSD& key)
-  : LLMultiFloater(key)
-{
-	// avoid resizing of the window to match 
-	// the initial size of the tabbed-childs, whenever a tab is opened or closed
-	mAutoResize = false;
-	// enabled autocous blocks controling focus via  LLFloaterReg::showInstance
-	setAutoFocus(false);
-}
-
-LLFloaterScriptDebug::~LLFloaterScriptDebug()
-{
-}
-
-void LLFloaterScriptDebug::show(const LLUUID& object_id)
-{
-	addOutputWindow(object_id);
-}
-
-bool LLFloaterScriptDebug::postBuild()
-{
-	LLMultiFloater::postBuild();
-
-	if (mTabContainer)
-	{
-		return true;
-	}
-
-	return false;
-}
-
-void LLFloaterScriptDebug::setVisible(bool visible)
-{
-	if(visible)
-	{
-		LLFloaterScriptDebugOutput* floater_output = LLFloaterReg::findTypedInstance<LLFloaterScriptDebugOutput>("script_debug_output", LLUUID::null);
-		if (floater_output == NULL)
-		{
-			floater_output = dynamic_cast<LLFloaterScriptDebugOutput*>(LLFloaterReg::showInstance("script_debug_output", LLUUID::null, false));
-			if (floater_output)
-			{
-				addFloater(floater_output, false);
-			}
-		}
-
-	}
-	LLMultiFloater::setVisible(visible);
-}
-
-void LLFloaterScriptDebug::closeFloater(bool app_quitting/* = false*/)
-{
-	if(app_quitting)
-	{
-		LLMultiFloater::closeFloater(app_quitting);
-	}
-	else
-	{
-		setVisible(false);
-	}
-}
-
-LLFloater* LLFloaterScriptDebug::addOutputWindow(const LLUUID &object_id)
-{
-	LLMultiFloater* host = LLFloaterReg::showTypedInstance<LLMultiFloater>("script_debug", LLSD());
-	if (!host)
-		return NULL;
-
-	LLFloater::setFloaterHost(host);
-	// prevent stealing focus, see EXT-8040
-	LLFloater* floaterp = LLFloaterReg::showInstance("script_debug_output", object_id, false);
-	LLFloater::setFloaterHost(NULL);
-
-	return floaterp;
-}
-
-void LLFloaterScriptDebug::addScriptLine(const std::string &utf8mesg, const std::string &user_name, const LLColor4& color, const LLUUID& source_id)
-{
-	LLViewerObject* objectp = gObjectList.findObject(source_id);
-	std::string floater_label;
-
-	// Handle /me messages.
-	std::string prefix = utf8mesg.substr(0, 4);
-	std::string message = (prefix == "/me " || prefix == "/me'") ? user_name + utf8mesg.substr(3) : utf8mesg;
-
-	if (objectp)
-	{
-		if(objectp->isHUDAttachment())
-		{
-			if (isAgentAvatarValid())
-			{
-				((LLViewerObject*)gAgentAvatarp)->setIcon(LLViewerTextureManager::getFetchedTextureFromFile("script_error.j2c", FTT_LOCAL_FILE, true, LLGLTexture::BOOST_UI));
-			}
-		}
-		else
-		{
-			objectp->setIcon(LLViewerTextureManager::getFetchedTextureFromFile("script_error.j2c", FTT_LOCAL_FILE, true, LLGLTexture::BOOST_UI));
-		}
-		floater_label = llformat("%s(%.0f, %.0f, %.0f)",
-						user_name.c_str(),
-						objectp->getPositionRegion().mV[VX],
-						objectp->getPositionRegion().mV[VY],
-						objectp->getPositionRegion().mV[VZ]);
-	}
-	else
-	{
-		floater_label = user_name;
-	}
-
-	addOutputWindow(source_id);
-
-	// add to "All" floater
-	LLFloaterScriptDebugOutput* floaterp = 	LLFloaterReg::getTypedInstance<LLFloaterScriptDebugOutput>("script_debug_output", LLUUID::null);
-	if (floaterp)
-	{
-		floaterp->addLine(message, user_name, color);
-	}
-	
-	// add to specific script instance floater
-	floaterp = LLFloaterReg::getTypedInstance<LLFloaterScriptDebugOutput>("script_debug_output", source_id);
-	if (floaterp)
-	{
-		floaterp->addLine(message, floater_label, color);
-	}
-}
-
-//
-// LLFloaterScriptDebugOutput
-//
-
-LLFloaterScriptDebugOutput::LLFloaterScriptDebugOutput(const LLSD& object_id)
-  : LLFloater(LLSD(object_id)),
-	mObjectID(object_id.asUUID())
-{
-	// enabled autocous blocks controling focus via  LLFloaterReg::showInstance
-	setAutoFocus(false);
-}
-
-bool LLFloaterScriptDebugOutput::postBuild()
-{
-	LLFloater::postBuild();
-	mHistoryEditor = getChild<LLViewerTextEditor>("Chat History Editor");
-	return true;
-}
-
-LLFloaterScriptDebugOutput::~LLFloaterScriptDebugOutput()
-{
-}
-
-void LLFloaterScriptDebugOutput::addLine(const std::string &utf8mesg, const std::string &user_name, const LLColor4& color)
-{
-	if (mObjectID.isNull())
-	{
-		setCanTearOff(false);
-		setCanClose(false);
-	}
-	else
-	{
-		setTitle(user_name);
-		setShortTitle(user_name);
-	}
-
-	mHistoryEditor->appendText(utf8mesg, true, LLStyle::Params().color(color));
-	mHistoryEditor->blockUndo();
-}
-
+/**

+ * @file llfloaterscriptdebug.cpp

+ * @brief Chat window for showing script errors and warnings

+ *

+ * $LicenseInfo:firstyear=2006&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 "llfloaterscriptdebug.h"

+

+#include "llfloaterreg.h"

+#include "lluictrlfactory.h"

+#include "llfontgl.h"

+#include "llrect.h"

+#include "llerror.h"

+#include "llstring.h"

+#include "llvoavatarself.h"

+#include "message.h"

+

+// project include

+#include "llviewertexteditor.h"

+#include "llviewercontrol.h"

+#include "llviewerobjectlist.h"

+#include "llviewertexturelist.h"

+

+//

+// Statics

+//

+

+//

+// Member Functions

+//

+LLFloaterScriptDebug::LLFloaterScriptDebug(const LLSD& key)

+  : LLMultiFloater(key)

+{

+    // avoid resizing of the window to match

+    // the initial size of the tabbed-childs, whenever a tab is opened or closed

+    mAutoResize = false;

+    // enabled autocous blocks controling focus via  LLFloaterReg::showInstance

+    setAutoFocus(false);

+}

+

+LLFloaterScriptDebug::~LLFloaterScriptDebug()

+{

+}

+

+void LLFloaterScriptDebug::show(const LLUUID& object_id)

+{

+    addOutputWindow(object_id);

+}

+

+bool LLFloaterScriptDebug::postBuild()

+{

+    LLMultiFloater::postBuild();

+

+    if (mTabContainer)

+    {

+        return true;

+    }

+

+    return false;

+}

+

+void LLFloaterScriptDebug::setVisible(bool visible)

+{

+    if(visible)

+    {

+        LLFloaterScriptDebugOutput* floater_output = LLFloaterReg::findTypedInstance<LLFloaterScriptDebugOutput>("script_debug_output", LLUUID::null);

+        if (floater_output == NULL)

+        {

+            floater_output = dynamic_cast<LLFloaterScriptDebugOutput*>(LLFloaterReg::showInstance("script_debug_output", LLUUID::null, false));

+            if (floater_output)

+            {

+                addFloater(floater_output, false);

+            }

+        }

+

+    }

+    LLMultiFloater::setVisible(visible);

+}

+

+void LLFloaterScriptDebug::closeFloater(bool app_quitting/* = false*/)

+{

+    if(app_quitting)

+    {

+        LLMultiFloater::closeFloater(app_quitting);

+    }

+    else

+    {

+        setVisible(false);

+    }

+}

+

+LLFloater* LLFloaterScriptDebug::addOutputWindow(const LLUUID &object_id)

+{

+    LLMultiFloater* host = LLFloaterReg::showTypedInstance<LLMultiFloater>("script_debug", LLSD());

+    if (!host)

+        return NULL;

+

+    LLFloater::setFloaterHost(host);

+    // prevent stealing focus, see EXT-8040

+    LLFloater* floaterp = LLFloaterReg::showInstance("script_debug_output", object_id, false);

+    LLFloater::setFloaterHost(NULL);

+

+    return floaterp;

+}

+

+void LLFloaterScriptDebug::addScriptLine(const std::string &utf8mesg, const std::string &user_name, const LLColor4& color, const LLUUID& source_id)

+{

+    LLViewerObject* objectp = gObjectList.findObject(source_id);

+    std::string floater_label;

+

+    // Handle /me messages.

+    std::string prefix = utf8mesg.substr(0, 4);

+    std::string message = (prefix == "/me " || prefix == "/me'") ? user_name + utf8mesg.substr(3) : utf8mesg;

+

+    if (objectp)

+    {

+        if(objectp->isHUDAttachment())

+        {

+            if (isAgentAvatarValid())

+            {

+                ((LLViewerObject*)gAgentAvatarp)->setIcon(LLViewerTextureManager::getFetchedTextureFromFile("script_error.j2c", FTT_LOCAL_FILE, true, LLGLTexture::BOOST_UI));

+            }

+        }

+        else

+        {

+            objectp->setIcon(LLViewerTextureManager::getFetchedTextureFromFile("script_error.j2c", FTT_LOCAL_FILE, true, LLGLTexture::BOOST_UI));

+        }

+        floater_label = llformat("%s(%.0f, %.0f, %.0f)",

+                        user_name.c_str(),

+                        objectp->getPositionRegion().mV[VX],

+                        objectp->getPositionRegion().mV[VY],

+                        objectp->getPositionRegion().mV[VZ]);

+    }

+    else

+    {

+        floater_label = user_name;

+    }

+

+    addOutputWindow(source_id);

+

+    // add to "All" floater

+    LLFloaterScriptDebugOutput* floaterp =  LLFloaterReg::getTypedInstance<LLFloaterScriptDebugOutput>("script_debug_output", LLUUID::null);

+    if (floaterp)

+    {

+        floaterp->addLine(message, user_name, color);

+    }

+

+    // add to specific script instance floater

+    floaterp = LLFloaterReg::getTypedInstance<LLFloaterScriptDebugOutput>("script_debug_output", source_id);

+    if (floaterp)

+    {

+        floaterp->addLine(message, floater_label, color);

+    }

+}

+

+//

+// LLFloaterScriptDebugOutput

+//

+

+LLFloaterScriptDebugOutput::LLFloaterScriptDebugOutput(const LLSD& object_id)

+  : LLFloater(LLSD(object_id)),

+    mObjectID(object_id.asUUID())

+{

+    // enabled autocous blocks controling focus via  LLFloaterReg::showInstance

+    setAutoFocus(false);

+}

+

+bool LLFloaterScriptDebugOutput::postBuild()

+{

+    LLFloater::postBuild();

+    mHistoryEditor = getChild<LLViewerTextEditor>("Chat History Editor");

+    return true;

+}

+

+LLFloaterScriptDebugOutput::~LLFloaterScriptDebugOutput()

+{

+}

+

+void LLFloaterScriptDebugOutput::addLine(const std::string &utf8mesg, const std::string &user_name, const LLColor4& color)

+{

+    if (mObjectID.isNull())

+    {

+        setCanTearOff(false);

+        setCanClose(false);

+    }

+    else

+    {

+        setTitle(user_name);

+        setShortTitle(user_name);

+    }

+

+    mHistoryEditor->appendText(utf8mesg, true, LLStyle::Params().color(color));

+    mHistoryEditor->blockUndo();

+}

+