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

diff --git a/indra/llui/llloadingindicator.h b/indra/llui/llloadingindicator.h
index ffcb329f42..5e824af993 100644
--- a/indra/llui/llloadingindicator.h
+++ b/indra/llui/llloadingindicator.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llloadingindicator.h
  * @brief Perpetual loading indicator
  *
  * $LicenseInfo:firstyear=2010&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,69 +36,69 @@
 
 /**
  * Perpetual loading indicator (a la MacOSX or YouTube)
- * 
+ *
  * Number of rotations per second can be overridden
  * with the "images_per_sec" parameter.
- * 
+ *
  * Can start/stop spinning.
- * 
+ *
  * @see start()
  * @see stop()
  */
 class LLLoadingIndicator
 : public LLUICtrl
 {
-	LOG_CLASS(LLLoadingIndicator);
+    LOG_CLASS(LLLoadingIndicator);
 public:
 
-	struct Images : public LLInitParam::Block<Images>
-	{
-		Multiple<LLUIImage*>	image;
+    struct Images : public LLInitParam::Block<Images>
+    {
+        Multiple<LLUIImage*>    image;
 
-		Images()
-		:	image("image")
-		{}
-	};
+        Images()
+        :   image("image")
+        {}
+    };
 
-	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
-	{
-		Optional<F32>				images_per_sec;
-		Optional<Atomic<Images> >	images;
+    struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+    {
+        Optional<F32>               images_per_sec;
+        Optional<Atomic<Images> >   images;
 
-		Params()
-		:	images_per_sec("images_per_sec", 1.0f),
-			images("images")
-		{}
-	};
+        Params()
+        :   images_per_sec("images_per_sec", 1.0f),
+            images("images")
+        {}
+    };
 
-	virtual ~LLLoadingIndicator() {}
+    virtual ~LLLoadingIndicator() {}
 
-	// llview overrides
-	virtual void draw();
+    // llview overrides
+    virtual void draw();
 
-	/**
-	 * Stop spinning.
-	 */
-	void stop();
+    /**
+     * Stop spinning.
+     */
+    void stop();
 
-	/**
-	 * Start spinning.
-	 */
-	void start();
+    /**
+     * Start spinning.
+     */
+    void start();
 
-	void reset() { mCurImageIdx = 0; }
+    void reset() { mCurImageIdx = 0; }
 
 private:
-	LLLoadingIndicator(const Params&);
-	void initFromParams(const Params&);
+    LLLoadingIndicator(const Params&);
+    void initFromParams(const Params&);
 
-	friend class LLUICtrlFactory;
+    friend class LLUICtrlFactory;
 
-	F32						mImagesPerSec;
-	S8						mCurImageIdx;
-	LLFrameTimer			mImageSwitchTimer;
+    F32                     mImagesPerSec;
+    S8                      mCurImageIdx;
+    LLFrameTimer            mImageSwitchTimer;
 
-	std::vector<LLUIImagePtr> mImages;
+    std::vector<LLUIImagePtr> mImages;
 };
 
 #endif // LL_LLLOADINGINDICATOR_H