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

diff --git a/indra/llui/lltransutil.cpp b/indra/llui/lltransutil.cpp
index a783fdd013..7f44f05f2b 100644
--- a/indra/llui/lltransutil.cpp
+++ b/indra/llui/lltransutil.cpp
@@ -1,74 +1,74 @@
-/**
- * @file lltrans.cpp
- * @brief LLTrans implementation
- *
- * $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 "linden_common.h"
-
-#include "lltransutil.h"
-
-#include "lltrans.h"
-#include "lluictrlfactory.h"
-#include "llxmlnode.h"
-#include "lldir.h"
-
-bool LLTransUtil::parseStrings(const std::string& xml_filename, const std::set<std::string>& default_args)
-{
-	LLXMLNodePtr root;
-	// Pass LLDir::ALL_SKINS to load a composite of all the individual string
-	// definitions in the default skin and the current skin. This means an
-	// individual skin can provide an xml_filename that overrides only a
-	// subset of the available string definitions; any string definition not
-	// overridden by that skin will be sought in the default skin.
-	bool success = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root, LLDir::ALL_SKINS);
-	if (!success)
-	{
-        const std::string error_string =
-            "Second Life viewer couldn't access some of the files it needs and will be closed."
-            "\n\nPlease reinstall viewer from  https://secondlife.com/support/downloads/ and "
-            "contact https://support.secondlife.com if issue persists after reinstall.";
-        LLError::LLUserWarningMsg::show(error_string);
-		gDirUtilp->dumpCurrentDirectories(LLError::LEVEL_WARN);
-		LL_ERRS() << "Couldn't load string table " << xml_filename << " " << errno << LL_ENDL;
-		return false;
-	}
-
-	return LLTrans::parseStrings(root, default_args);
-}
-
-
-bool LLTransUtil::parseLanguageStrings(const std::string& xml_filename)
-{
-	LLXMLNodePtr root;
-	bool success  = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root);
-	
-	if (!success)
-	{
-        LLError::LLUserWarningMsg::showMissingFiles();
-		LL_ERRS() << "Couldn't load localization table " << xml_filename << LL_ENDL;
-		return false;
-	}
-	
-	return LLTrans::parseLanguageStrings(root);
-}
+/**

+ * @file lltrans.cpp

+ * @brief LLTrans implementation

+ *

+ * $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 "linden_common.h"

+

+#include "lltransutil.h"

+

+#include "lltrans.h"

+#include "lluictrlfactory.h"

+#include "llxmlnode.h"

+#include "lldir.h"

+

+bool LLTransUtil::parseStrings(const std::string& xml_filename, const std::set<std::string>& default_args)

+{

+    LLXMLNodePtr root;

+    // Pass LLDir::ALL_SKINS to load a composite of all the individual string

+    // definitions in the default skin and the current skin. This means an

+    // individual skin can provide an xml_filename that overrides only a

+    // subset of the available string definitions; any string definition not

+    // overridden by that skin will be sought in the default skin.

+    bool success = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root, LLDir::ALL_SKINS);

+    if (!success)

+    {

+        const std::string error_string =

+            "Second Life viewer couldn't access some of the files it needs and will be closed."

+            "\n\nPlease reinstall viewer from  https://secondlife.com/support/downloads/ and "

+            "contact https://support.secondlife.com if issue persists after reinstall.";

+        LLError::LLUserWarningMsg::show(error_string);

+        gDirUtilp->dumpCurrentDirectories(LLError::LEVEL_WARN);

+        LL_ERRS() << "Couldn't load string table " << xml_filename << " " << errno << LL_ENDL;

+        return false;

+    }

+

+    return LLTrans::parseStrings(root, default_args);

+}

+

+

+bool LLTransUtil::parseLanguageStrings(const std::string& xml_filename)

+{

+    LLXMLNodePtr root;

+    bool success  = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root);

+

+    if (!success)

+    {

+        LLError::LLUserWarningMsg::showMissingFiles();

+        LL_ERRS() << "Couldn't load localization table " << xml_filename << LL_ENDL;

+        return false;

+    }

+

+    return LLTrans::parseLanguageStrings(root);

+}