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

diff --git a/indra/llui/llspellcheck.h b/indra/llui/llspellcheck.h
index 14f9b44fe4..e4d8a12ef1 100644
--- a/indra/llui/llspellcheck.h
+++ b/indra/llui/llspellcheck.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llspellcheck.h
  * @brief Spell checking functionality
  *
  * $LicenseInfo:firstyear=2001&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$
  */
@@ -36,55 +36,55 @@ class Hunspell;
 
 class LLSpellChecker : public LLSingleton<LLSpellChecker>
 {
-	LLSINGLETON(LLSpellChecker);
-	~LLSpellChecker();
+    LLSINGLETON(LLSpellChecker);
+    ~LLSpellChecker();
 
 public:
-	void addToCustomDictionary(const std::string& word);
-	void addToIgnoreList(const std::string& word);
-	bool checkSpelling(const std::string& word) const;
-	S32  getSuggestions(const std::string& word, std::vector<std::string>& suggestions) const;
+    void addToCustomDictionary(const std::string& word);
+    void addToIgnoreList(const std::string& word);
+    bool checkSpelling(const std::string& word) const;
+    S32  getSuggestions(const std::string& word, std::vector<std::string>& suggestions) const;
 protected:
-	void addToDictFile(const std::string& dict_path, const std::string& word);
-	void initHunspell(const std::string& dict_language);
-	void initSingleton() override;
+    void addToDictFile(const std::string& dict_path, const std::string& word);
+    void initHunspell(const std::string& dict_language);
+    void initSingleton() override;
 
 public:
-	typedef std::list<std::string> dict_list_t;
+    typedef std::list<std::string> dict_list_t;
 
-	const std::string&	getPrimaryDictionary() const { return mDictLanguage; }
-	const dict_list_t&	getSecondaryDictionaries() const { return mDictSecondary; }
-	bool				isActiveDictionary(const std::string& dict_language) const;
-	void				setSecondaryDictionaries(dict_list_t dict_list);
+    const std::string&  getPrimaryDictionary() const { return mDictLanguage; }
+    const dict_list_t&  getSecondaryDictionaries() const { return mDictSecondary; }
+    bool                isActiveDictionary(const std::string& dict_language) const;
+    void                setSecondaryDictionaries(dict_list_t dict_list);
 
-	bool					 canRemoveDictionary(const std::string& dict_language);
-	static const std::string getDictionaryAppPath();
-	static const std::string getDictionaryUserPath();
-	const LLSD				 getDictionaryData(const std::string& dict_language);
-	const LLSD&				 getDictionaryMap() { return mDictMap; }
-	static bool				 getUseSpellCheck();
-	bool					 hasDictionary(const std::string& dict_language, bool check_installed = false);
-	void					 refreshDictionaryMap();
-	void					 removeDictionary(const std::string& dict_language);
-	static void				 setUseSpellCheck(const std::string& dict_language);
+    bool                     canRemoveDictionary(const std::string& dict_language);
+    static const std::string getDictionaryAppPath();
+    static const std::string getDictionaryUserPath();
+    const LLSD               getDictionaryData(const std::string& dict_language);
+    const LLSD&              getDictionaryMap() { return mDictMap; }
+    static bool              getUseSpellCheck();
+    bool                     hasDictionary(const std::string& dict_language, bool check_installed = false);
+    void                     refreshDictionaryMap();
+    void                     removeDictionary(const std::string& dict_language);
+    static void              setUseSpellCheck(const std::string& dict_language);
 protected:
-	static LLSD				 loadUserDictionaryMap();
-	void					 setDictionaryData(const LLSD& dict_info);
-	static void				 saveUserDictionaryMap(const LLSD& dict_map);
+    static LLSD              loadUserDictionaryMap();
+    void                     setDictionaryData(const LLSD& dict_info);
+    static void              saveUserDictionaryMap(const LLSD& dict_map);
 
 public:
-	typedef boost::signals2::signal<void()> settings_change_signal_t;
-	static boost::signals2::connection setSettingsChangeCallback(const settings_change_signal_t::slot_type& cb);
+    typedef boost::signals2::signal<void()> settings_change_signal_t;
+    static boost::signals2::connection setSettingsChangeCallback(const settings_change_signal_t::slot_type& cb);
 
 protected:
-	Hunspell*	mHunspell;
-	std::string	mDictLanguage;
-	std::string	mDictFile;
-	dict_list_t	mDictSecondary;
-	std::vector<std::string> mIgnoreList;
-	LLSD mDictMap;
+    Hunspell*   mHunspell;
+    std::string mDictLanguage;
+    std::string mDictFile;
+    dict_list_t mDictSecondary;
+    std::vector<std::string> mIgnoreList;
+    LLSD mDictMap;
 
-	static settings_change_signal_t	sSettingsChangeSignal;
+    static settings_change_signal_t sSettingsChangeSignal;
 };
 
 #endif // LLSPELLCHECK_H