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

diff --git a/indra/llcommon/lldeadmantimer.cpp b/indra/llcommon/lldeadmantimer.cpp
index 830443b956..f9c14d7c24 100644
--- a/indra/llcommon/lldeadmantimer.cpp
+++ b/indra/llcommon/lldeadmantimer.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
 * @file lldeadmantimer.cpp
 * @brief Simple deadman-switch timer.
 * @author monty@lindenlab.com
@@ -43,146 +43,146 @@
 //    true    true   Not allowed
 //
 LLDeadmanTimer::LLDeadmanTimer(F64 horizon, bool inc_cpu)
-	: mHorizon(time_type(llmax(horizon, F64(0.0)) * get_timer_info().mClockFrequency)),
-	  mActive(false),			// If true, a timer is running.
-	  mDone(false),				// If true, timer has completed and can be read (once)
-	  mStarted(U64L(0)),
-	  mExpires(U64L(0)),
-	  mStopped(U64L(0)),
-	  mCount(U64L(0)),
-	  mIncCPU(inc_cpu),
-	  mUStartCPU(LLProcInfo::time_type(U64L(0))),
-	  mUEndCPU(LLProcInfo::time_type(U64L(0))),
-	  mSStartCPU(LLProcInfo::time_type(U64L(0))),
-	  mSEndCPU(LLProcInfo::time_type(U64L(0)))
+    : mHorizon(time_type(llmax(horizon, F64(0.0)) * get_timer_info().mClockFrequency)),
+      mActive(false),           // If true, a timer is running.
+      mDone(false),             // If true, timer has completed and can be read (once)
+      mStarted(U64L(0)),
+      mExpires(U64L(0)),
+      mStopped(U64L(0)),
+      mCount(U64L(0)),
+      mIncCPU(inc_cpu),
+      mUStartCPU(LLProcInfo::time_type(U64L(0))),
+      mUEndCPU(LLProcInfo::time_type(U64L(0))),
+      mSStartCPU(LLProcInfo::time_type(U64L(0))),
+      mSEndCPU(LLProcInfo::time_type(U64L(0)))
 {}
 
 
 // static
 LLDeadmanTimer::time_type LLDeadmanTimer::getNow()
 {
-	return LLTimer::getCurrentClockCount();
+    return LLTimer::getCurrentClockCount();
 }
 
 
 void LLDeadmanTimer::start(time_type now)
 {
-	// *TODO:  If active, let's complete an existing timer and save
-	// the result to the side.  I think this will be useful later.
-	// For now, wipe out anything in progress, start fresh.
-	
-	if (! now)
-	{
-		now = LLTimer::getCurrentClockCount();
-	}
-	mActive = true;
-	mDone = false;
-	mStarted = now;
-	mExpires = now + mHorizon;
-	mStopped = now;
-	mCount = U64L(0);
-	if (mIncCPU)
-	{
-		LLProcInfo::getCPUUsage(mUStartCPU, mSStartCPU);
-	}
+    // *TODO:  If active, let's complete an existing timer and save
+    // the result to the side.  I think this will be useful later.
+    // For now, wipe out anything in progress, start fresh.
+
+    if (! now)
+    {
+        now = LLTimer::getCurrentClockCount();
+    }
+    mActive = true;
+    mDone = false;
+    mStarted = now;
+    mExpires = now + mHorizon;
+    mStopped = now;
+    mCount = U64L(0);
+    if (mIncCPU)
+    {
+        LLProcInfo::getCPUUsage(mUStartCPU, mSStartCPU);
+    }
 }
 
 
 void LLDeadmanTimer::stop(time_type now)
 {
-	if (! mActive)
-	{
-		return;
-	}
-
-	if (! now)
-	{
-		now = getNow();
-	}
-	mStopped = now;
-	mActive = false;
-	mDone = true;
-	if (mIncCPU)
-	{
-		LLProcInfo::getCPUUsage(mUEndCPU, mSEndCPU);
-	}
+    if (! mActive)
+    {
+        return;
+    }
+
+    if (! now)
+    {
+        now = getNow();
+    }
+    mStopped = now;
+    mActive = false;
+    mDone = true;
+    if (mIncCPU)
+    {
+        LLProcInfo::getCPUUsage(mUEndCPU, mSEndCPU);
+    }
 }
 
 
 bool LLDeadmanTimer::isExpired(time_type now, F64 & started, F64 & stopped, U64 & count,
-							   U64 & user_cpu, U64 & sys_cpu)
+                               U64 & user_cpu, U64 & sys_cpu)
 {
-	const bool status(isExpired(now, started, stopped, count));
-	if (status)
-	{
-		user_cpu = U64(mUEndCPU - mUStartCPU);
-		sys_cpu = U64(mSEndCPU - mSStartCPU);
-	}
-	return status;
+    const bool status(isExpired(now, started, stopped, count));
+    if (status)
+    {
+        user_cpu = U64(mUEndCPU - mUStartCPU);
+        sys_cpu = U64(mSEndCPU - mSStartCPU);
+    }
+    return status;
 }
 
-		
+
 bool LLDeadmanTimer::isExpired(time_type now, F64 & started, F64 & stopped, U64 & count)
 {
-	if (mActive && ! mDone)
-	{
-		if (! now)
-		{
-			now = getNow();
-		}
-
-		if (now >= mExpires)
-		{
-			// mStopped from ringBell() is the value we want
-			mActive = false;
-			mDone = true;
-		}
-	}
-
-	if (! mDone)
-	{
-		return false;
-	}
-	
-	started = mStarted * get_timer_info().mClockFrequencyInv;
-	stopped = mStopped * get_timer_info().mClockFrequencyInv;
-	count = mCount;
-	mDone = false;
-
-	return true;
+    if (mActive && ! mDone)
+    {
+        if (! now)
+        {
+            now = getNow();
+        }
+
+        if (now >= mExpires)
+        {
+            // mStopped from ringBell() is the value we want
+            mActive = false;
+            mDone = true;
+        }
+    }
+
+    if (! mDone)
+    {
+        return false;
+    }
+
+    started = mStarted * get_timer_info().mClockFrequencyInv;
+    stopped = mStopped * get_timer_info().mClockFrequencyInv;
+    count = mCount;
+    mDone = false;
+
+    return true;
 }
 
-	
+
 void LLDeadmanTimer::ringBell(time_type now, unsigned int count)
 {
-	if (! mActive)
-	{
-		return;
-	}
-	
-	if (! now)
-	{
-		now = getNow();
-	}
-
-	if (now >= mExpires)
-	{
-		// Timer has expired, this event will be dropped
-		mActive = false;
-		mDone = true;
-	}
-	else
-	{
-		// Timer renewed, keep going
-		mStopped = now;
-		mExpires = now + mHorizon;
-		mCount += count;
-		if (mIncCPU)
-		{
-			LLProcInfo::getCPUUsage(mUEndCPU, mSEndCPU);
-		}
-	}
-	
-	return;
+    if (! mActive)
+    {
+        return;
+    }
+
+    if (! now)
+    {
+        now = getNow();
+    }
+
+    if (now >= mExpires)
+    {
+        // Timer has expired, this event will be dropped
+        mActive = false;
+        mDone = true;
+    }
+    else
+    {
+        // Timer renewed, keep going
+        mStopped = now;
+        mExpires = now + mHorizon;
+        mCount += count;
+        if (mIncCPU)
+        {
+            LLProcInfo::getCPUUsage(mUEndCPU, mSEndCPU);
+        }
+    }
+
+    return;
 }