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

diff --git a/indra/llcommon/llheartbeat.h b/indra/llcommon/llheartbeat.h
index 4a75fcc103..54feeb4c92 100644
--- a/indra/llcommon/llheartbeat.h
+++ b/indra/llcommon/llheartbeat.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llheartbeat.h
  * @brief Class encapsulating logic for telling a watchdog that we live.
  *
  * $LicenseInfo:firstyear=2008&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$
  */
@@ -37,32 +37,32 @@
 class LL_COMMON_API LLHeartbeat
 {
 public:
-	// secs_between_heartbeat: after a heartbeat is successfully delivered,
-	//   we suppress sending more for this length of time.
-	// aggressive_heartbeat_panic_secs: if we've been failing to
-	//   successfully deliver heartbeats for this length of time then
-	//   we block for a while until we're really sure we got one delivered.
-	// aggressive_heartbeat_max_blocking_secs: this is the length of
-	//   time we block for when we're aggressively ensuring that a 'panic'
-	//   heartbeat was delivered.
-	LLHeartbeat(F32 secs_between_heartbeat = 5.0f,
-		    F32 aggressive_heartbeat_panic_secs = 10.0f,
-		    F32 aggressive_heartbeat_max_blocking_secs = 4.0f);
-	~LLHeartbeat();
+    // secs_between_heartbeat: after a heartbeat is successfully delivered,
+    //   we suppress sending more for this length of time.
+    // aggressive_heartbeat_panic_secs: if we've been failing to
+    //   successfully deliver heartbeats for this length of time then
+    //   we block for a while until we're really sure we got one delivered.
+    // aggressive_heartbeat_max_blocking_secs: this is the length of
+    //   time we block for when we're aggressively ensuring that a 'panic'
+    //   heartbeat was delivered.
+    LLHeartbeat(F32 secs_between_heartbeat = 5.0f,
+            F32 aggressive_heartbeat_panic_secs = 10.0f,
+            F32 aggressive_heartbeat_max_blocking_secs = 4.0f);
+    ~LLHeartbeat();
 
-	bool send(F32 timeout_sec = 0.0f);
-	void setSuppressed(bool is_suppressed);
+    bool send(F32 timeout_sec = 0.0f);
+    void setSuppressed(bool is_suppressed);
 
 private:
-	int rawSend();
-	int rawSendWithTimeout(F32 timeout_sec);
-	F32 mSecsBetweenHeartbeat;
-	F32 mAggressiveHeartbeatPanicSecs;
-	F32 mAggressiveHeartbeatMaxBlockingSecs;
-	bool mSuppressed;
-	LLTimer mBeatTimer;
-	LLTimer mPanicTimer;
-	LLTimer mTimeoutTimer;
+    int rawSend();
+    int rawSendWithTimeout(F32 timeout_sec);
+    F32 mSecsBetweenHeartbeat;
+    F32 mAggressiveHeartbeatPanicSecs;
+    F32 mAggressiveHeartbeatMaxBlockingSecs;
+    bool mSuppressed;
+    LLTimer mBeatTimer;
+    LLTimer mPanicTimer;
+    LLTimer mTimeoutTimer;
 };
 
 #endif // LL_HEARTBEAT_H