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

diff --git a/indra/llui/lltextutil.h b/indra/llui/lltextutil.h
index 1adc3516f7..f3838e59fa 100644
--- a/indra/llui/lltextutil.h
+++ b/indra/llui/lltextutil.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lltextutil.h
  * @brief Misc text-related auxiliary methods
  *
  * $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$
  */
@@ -36,48 +36,48 @@ class LLTextBase;
 namespace LLTextUtil
 {
 
-	/**
-	 * Set value for text box, highlighting substring hl_uc.
-	 * 
-	 * Used to highlight filter matches.
-	 * 
-	 * @param txtbox        Text box to set value for
-	 * @param normal_style  Style to use for non-highlighted text
-	 * @param text          Text to set
-	 * @param hl            Upper-cased string to highlight
-	 */
-	void textboxSetHighlightedVal(
-		LLTextBox *txtbox,
-		const LLStyle::Params& normal_style,
-		const std::string& text,
-		const std::string& hl);
+    /**
+     * Set value for text box, highlighting substring hl_uc.
+     *
+     * Used to highlight filter matches.
+     *
+     * @param txtbox        Text box to set value for
+     * @param normal_style  Style to use for non-highlighted text
+     * @param text          Text to set
+     * @param hl            Upper-cased string to highlight
+     */
+    void textboxSetHighlightedVal(
+        LLTextBox *txtbox,
+        const LLStyle::Params& normal_style,
+        const std::string& text,
+        const std::string& hl);
+
+    void textboxSetGreyedVal(
+            LLTextBox *txtbox,
+            const LLStyle::Params& normal_style,
+            const std::string& text,
+            const std::string& greyed);
 
-	void textboxSetGreyedVal(
-	        LLTextBox *txtbox,
-	        const LLStyle::Params& normal_style,
-	        const std::string& text,
-	        const std::string& greyed);
+    /**
+     * Adds icon before url if need.
+     *
+     * @param[in] match an object with results of matching
+     * @param[in] text_base pointer to UI text object
+     * @param[in] is_content_trusted true if context is trusted
+     * @return reference to string with formatted phone number
+     */
+    bool processUrlMatch(LLUrlMatch* match, LLTextBase* text_base, bool is_content_trusted);
 
-	/**
-	 * Adds icon before url if need.
-	 *
-	 * @param[in] match an object with results of matching
-	 * @param[in] text_base pointer to UI text object
-	 * @param[in] is_content_trusted true if context is trusted
-	 * @return reference to string with formatted phone number
-	 */
-	bool processUrlMatch(LLUrlMatch* match, LLTextBase* text_base, bool is_content_trusted);
+    class TextHelpers
+    {
 
-	class TextHelpers
-	{
+        //we need this special callback since we need to create LLAvataIconCtrls while parsing
+        //avatar/group url but can't create LLAvataIconCtrl from LLUI
+        public:
+            static boost::function<bool(LLUrlMatch*,LLTextBase*)> iconCallbackCreationFunction;
+    };
 
-		//we need this special callback since we need to create LLAvataIconCtrls while parsing
-		//avatar/group url but can't create LLAvataIconCtrl from LLUI
-		public:
-			static boost::function<bool(LLUrlMatch*,LLTextBase*)> iconCallbackCreationFunction;
-	};
 
-	
 }
 
 #endif // LL_LLTEXTUTIL_H