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

diff --git a/indra/llui/llloadingindicator.cpp b/indra/llui/llloadingindicator.cpp
index e8b6b7e43b..70730705e6 100644
--- a/indra/llui/llloadingindicator.cpp
+++ b/indra/llui/llloadingindicator.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llloadingindicator.cpp
  * @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$
  */
@@ -43,57 +43,57 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 LLLoadingIndicator::LLLoadingIndicator(const Params& p)
-:	LLUICtrl(p), 
-	mImagesPerSec(p.images_per_sec > 0 ? p.images_per_sec : 1.0f), 
-	mCurImageIdx(0)
+:   LLUICtrl(p),
+    mImagesPerSec(p.images_per_sec > 0 ? p.images_per_sec : 1.0f),
+    mCurImageIdx(0)
 {
 }
 
 void LLLoadingIndicator::initFromParams(const Params& p)
 {
-	for (LLUIImage* image : p.images().image)
-	{
-		mImages.push_back(image);
-	}
+    for (LLUIImage* image : p.images().image)
+    {
+        mImages.push_back(image);
+    }
 
-	// Start timer for switching images.
-	start();
+    // Start timer for switching images.
+    start();
 }
 
 void LLLoadingIndicator::draw()
 {
-	// Time to switch to the next image?
-	if (mImageSwitchTimer.getStarted() && mImageSwitchTimer.hasExpired())
-	{
-		// Switch to the next image.
-		if (!mImages.empty())
-		{
-			mCurImageIdx = (mCurImageIdx + 1) % mImages.size();
-		}
-
-		// Restart timer.
-		start();
-	}
-
-	LLUIImagePtr cur_image = mImages.empty() ? LLUIImagePtr(NULL) : mImages[mCurImageIdx];
-
-	// Draw current image.
-	if( cur_image.notNull() )
-	{
-		cur_image->draw(getLocalRect(), LLColor4::white % getDrawContext().mAlpha);
-	}
-
-	LLUICtrl::draw();
+    // Time to switch to the next image?
+    if (mImageSwitchTimer.getStarted() && mImageSwitchTimer.hasExpired())
+    {
+        // Switch to the next image.
+        if (!mImages.empty())
+        {
+            mCurImageIdx = (mCurImageIdx + 1) % mImages.size();
+        }
+
+        // Restart timer.
+        start();
+    }
+
+    LLUIImagePtr cur_image = mImages.empty() ? LLUIImagePtr(NULL) : mImages[mCurImageIdx];
+
+    // Draw current image.
+    if( cur_image.notNull() )
+    {
+        cur_image->draw(getLocalRect(), LLColor4::white % getDrawContext().mAlpha);
+    }
+
+    LLUICtrl::draw();
 }
 
 void LLLoadingIndicator::stop()
 {
-	mImageSwitchTimer.stop();
+    mImageSwitchTimer.stop();
 }
 
 void LLLoadingIndicator::start()
 {
-	mImageSwitchTimer.start();
-	F32 period = 1.0f / (mImages.size() * mImagesPerSec);
-	mImageSwitchTimer.setTimerExpirySec(period);
+    mImageSwitchTimer.start();
+    F32 period = 1.0f / (mImages.size() * mImagesPerSec);
+    mImageSwitchTimer.setTimerExpirySec(period);
 }