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

diff --git a/indra/newview/lltranslate.h b/indra/newview/lltranslate.h
index 30fb8d74df..4dec49bf65 100644
--- a/indra/newview/lltranslate.h
+++ b/indra/newview/lltranslate.h
@@ -1,112 +1,112 @@
-/**
-* @file lltranslate.h
-* @brief Human language translation class and JSON response receiver.
-*
- * $LicenseInfo:firstyear=2009&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$
- */
-
-#ifndef LL_LLTRANSLATE_H
-#define LL_LLTRANSLATE_H
-
-#include "llbufferstream.h"
-#include <boost/function.hpp>
-
-#include "llsingleton.h"
-
-class LLTranslationAPIHandler;
-/**
- * Entry point for machine translation services.
- *
- * Basically, to translate a string, we need to know the URL
- * of a translation service, have a valid API for the service
- * and be given the target language.
- *
- * Callers specify the string to translate and the target language,
- * LLTranslate takes care of the rest.
- *
- * API keys for translation are taken from saved settings.
- */
-class LLTranslate: public LLSingleton<LLTranslate>
-{
-	LLSINGLETON(LLTranslate);
-	~LLTranslate();
-	LOG_CLASS(LLTranslate);
-
-public :
-
-	typedef enum e_service {
-		SERVICE_AZURE,
-		SERVICE_GOOGLE,
-		SERVICE_DEEPL,
-	} EService;
-
-    typedef boost::function<void(EService, bool, S32)> KeyVerificationResult_fn;
-    typedef boost::function<void(std::string , std::string )> TranslationSuccess_fn;
-    typedef boost::function<void(int, std::string)> TranslationFailure_fn;
-
-	/**
-	 * Translate given text.
-	 *
-	 * @param receiver   Object to pass translation result to.
-	 * @param from_lang  Source language. Leave empty for auto-detection.
-	 * @param to_lang    Target language.
-	 * @param mesg       Text to translate.
-	 */
-    static void translateMessage(const std::string &from_lang, const std::string &to_lang, const std::string &mesg, TranslationSuccess_fn success, TranslationFailure_fn failure);
-
-    /**
-     * Verify given API key of a translation service.
-     *
-     * @param receiver  Object to pass verification result to.
-     * @param key       Key to verify.
-     */
-    static void verifyKey(EService service, const LLSD &key, KeyVerificationResult_fn fnc);
-
-	/**
-	 * @return translation target language
-	 */
-	static std::string getTranslateLanguage();
-
-	/**
-	 * @return true if translation is configured properly.
-	 */
-	static bool isTranslationConfigured();
-
-    static std::string addNoTranslateTags(std::string mesg);
-    static std::string removeNoTranslateTags(std::string mesg);
-
-	void logCharsSeen(size_t count);
-	void logCharsSent(size_t count);
-	void logSuccess(S32 count);
-	void logFailure(S32 count);
-	LLSD asLLSD() const;
-private:
-	static LLTranslationAPIHandler& getPreferredHandler();
-	static LLTranslationAPIHandler& getHandler(EService service);
-
-	size_t mCharsSeen;
-	size_t mCharsSent;
-	S32 mFailureCount;
-	S32 mSuccessCount;
-};
-
-#endif
+/**

+* @file lltranslate.h

+* @brief Human language translation class and JSON response receiver.

+*

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

+ */

+

+#ifndef LL_LLTRANSLATE_H

+#define LL_LLTRANSLATE_H

+

+#include "llbufferstream.h"

+#include <boost/function.hpp>

+

+#include "llsingleton.h"

+

+class LLTranslationAPIHandler;

+/**

+ * Entry point for machine translation services.

+ *

+ * Basically, to translate a string, we need to know the URL

+ * of a translation service, have a valid API for the service

+ * and be given the target language.

+ *

+ * Callers specify the string to translate and the target language,

+ * LLTranslate takes care of the rest.

+ *

+ * API keys for translation are taken from saved settings.

+ */

+class LLTranslate: public LLSingleton<LLTranslate>

+{

+    LLSINGLETON(LLTranslate);

+    ~LLTranslate();

+    LOG_CLASS(LLTranslate);

+

+public :

+

+    typedef enum e_service {

+        SERVICE_AZURE,

+        SERVICE_GOOGLE,

+        SERVICE_DEEPL,

+    } EService;

+

+    typedef boost::function<void(EService, bool, S32)> KeyVerificationResult_fn;

+    typedef boost::function<void(std::string , std::string )> TranslationSuccess_fn;

+    typedef boost::function<void(int, std::string)> TranslationFailure_fn;

+

+    /**

+     * Translate given text.

+     *

+     * @param receiver   Object to pass translation result to.

+     * @param from_lang  Source language. Leave empty for auto-detection.

+     * @param to_lang    Target language.

+     * @param mesg       Text to translate.

+     */

+    static void translateMessage(const std::string &from_lang, const std::string &to_lang, const std::string &mesg, TranslationSuccess_fn success, TranslationFailure_fn failure);

+

+    /**

+     * Verify given API key of a translation service.

+     *

+     * @param receiver  Object to pass verification result to.

+     * @param key       Key to verify.

+     */

+    static void verifyKey(EService service, const LLSD &key, KeyVerificationResult_fn fnc);

+

+    /**

+     * @return translation target language

+     */

+    static std::string getTranslateLanguage();

+

+    /**

+     * @return true if translation is configured properly.

+     */

+    static bool isTranslationConfigured();

+

+    static std::string addNoTranslateTags(std::string mesg);

+    static std::string removeNoTranslateTags(std::string mesg);

+

+    void logCharsSeen(size_t count);

+    void logCharsSent(size_t count);

+    void logSuccess(S32 count);

+    void logFailure(S32 count);

+    LLSD asLLSD() const;

+private:

+    static LLTranslationAPIHandler& getPreferredHandler();

+    static LLTranslationAPIHandler& getHandler(EService service);

+

+    size_t mCharsSeen;

+    size_t mCharsSent;

+    S32 mFailureCount;

+    S32 mSuccessCount;

+};

+

+#endif