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

diff --git a/indra/llcommon/llrun.h b/indra/llcommon/llrun.h
index 42e3d9b47a..8061117ad5 100644
--- a/indra/llcommon/llrun.h
+++ b/indra/llcommon/llrun.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llrun.h
  * @author Phoenix
  * @date 2006-02-16
@@ -7,21 +7,21 @@
  * $LicenseInfo:firstyear=2006&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$
  */
@@ -34,7 +34,7 @@
 
 class LLRunnable;
 
-/** 
+/**
  * @class LLRunner
  * @brief This class manages a set of LLRunnable objects.
  *
@@ -45,96 +45,96 @@ class LLRunnable;
 class LL_COMMON_API LLRunner
 {
 public:
-	/**
-	 * @brief The pointer to a runnable.
-	 */
-	typedef std::shared_ptr<LLRunnable> run_ptr_t;
-
-	/**
-	 * @brief The handle for use in the API.
-	 */
-	typedef S64 run_handle_t;
-
-	/**
-	 * @brief Constructor.
-	 */
-	LLRunner();
-
-	/**
-	 * @brief Destructor.
-	 */
-	~LLRunner();
-
-	/** 
-	 * @brief Enumeration which specifies when to run.
-	 */
-	enum ERunSchedule
-	{
-		// The runnable will run in N seconds
-		RUN_IN,
-
-		// The run every N seconds
-		RUN_EVERY,
-
-		// A count of the run types
-		RUN_SCHEDULE_COUNT
-	};
-
-	/**
-	 * @brief Run the runnables which are scheduled to run
-	 *
-	 * @return Returns the number of runnables run.
-	 */
-	size_t run();
-
-	/** 
-	 * @brief Add a runnable to the run list.
-	 *
-	 * The handle of the runnable is unique to each addition. If the
-	 * same runnable is added a second time with the same or different
-	 * schedule, this method will return a new handle.
-	 * @param runnable The runnable to run() on schedule.
-	 * @param schedule Specifies the run schedule.
-	 * @param seconds When to run the runnable as interpreted by schedule.
-	 * @return Returns the handle to the runnable. handle == 0 means failure.
-	 */
-	run_handle_t addRunnable(
-		run_ptr_t runnable,
-		ERunSchedule schedule,
-		F64 seconds);
-	
-	/**
-	 * @brief Remove the specified runnable.
-	 *
-	 * @param handle The handle of the runnable to remove.
-	 * @return Returns the pointer to the runnable removed which may
-	 * be empty.
-	 */
-	run_ptr_t removeRunnable(run_handle_t handle);
+    /**
+     * @brief The pointer to a runnable.
+     */
+    typedef std::shared_ptr<LLRunnable> run_ptr_t;
+
+    /**
+     * @brief The handle for use in the API.
+     */
+    typedef S64 run_handle_t;
+
+    /**
+     * @brief Constructor.
+     */
+    LLRunner();
+
+    /**
+     * @brief Destructor.
+     */
+    ~LLRunner();
+
+    /**
+     * @brief Enumeration which specifies when to run.
+     */
+    enum ERunSchedule
+    {
+        // The runnable will run in N seconds
+        RUN_IN,
+
+        // The run every N seconds
+        RUN_EVERY,
+
+        // A count of the run types
+        RUN_SCHEDULE_COUNT
+    };
+
+    /**
+     * @brief Run the runnables which are scheduled to run
+     *
+     * @return Returns the number of runnables run.
+     */
+    size_t run();
+
+    /**
+     * @brief Add a runnable to the run list.
+     *
+     * The handle of the runnable is unique to each addition. If the
+     * same runnable is added a second time with the same or different
+     * schedule, this method will return a new handle.
+     * @param runnable The runnable to run() on schedule.
+     * @param schedule Specifies the run schedule.
+     * @param seconds When to run the runnable as interpreted by schedule.
+     * @return Returns the handle to the runnable. handle == 0 means failure.
+     */
+    run_handle_t addRunnable(
+        run_ptr_t runnable,
+        ERunSchedule schedule,
+        F64 seconds);
+
+    /**
+     * @brief Remove the specified runnable.
+     *
+     * @param handle The handle of the runnable to remove.
+     * @return Returns the pointer to the runnable removed which may
+     * be empty.
+     */
+    run_ptr_t removeRunnable(run_handle_t handle);
 
 protected:
-	struct LLRunInfo
-	{
-		run_handle_t mHandle;
-		run_ptr_t mRunnable;
-		ERunSchedule mSchedule;
-		F64 mNextRunAt;
-		F64 mIncrement;
-		LLRunInfo(
-			run_handle_t handle,
-			run_ptr_t runnable,
-			ERunSchedule schedule,
-			F64 next_run_at,
-			F64 increment);
-	};
-	typedef std::vector<LLRunInfo> run_list_t;
-	run_list_t mRunOnce;
-	run_list_t mRunEvery;
-	run_handle_t mNextHandle;
+    struct LLRunInfo
+    {
+        run_handle_t mHandle;
+        run_ptr_t mRunnable;
+        ERunSchedule mSchedule;
+        F64 mNextRunAt;
+        F64 mIncrement;
+        LLRunInfo(
+            run_handle_t handle,
+            run_ptr_t runnable,
+            ERunSchedule schedule,
+            F64 next_run_at,
+            F64 increment);
+    };
+    typedef std::vector<LLRunInfo> run_list_t;
+    run_list_t mRunOnce;
+    run_list_t mRunEvery;
+    run_handle_t mNextHandle;
 };
 
 
-/** 
+/**
  * @class LLRunnable
  * @brief Abstract base class for running some scheduled process.
  *
@@ -146,17 +146,17 @@ protected:
 class LL_COMMON_API LLRunnable
 {
 public:
-	LLRunnable();
-	virtual ~LLRunnable();
-
-	/** 
-	 * @brief Do the process.
-	 *
-	 * This method will be called from the LLRunner according to 
-	 * @param runner The Runner which call run().
-	 * @param handle The handle this run instance is run under.
-	 */
-	virtual void run(LLRunner* runner, S64 handle) = 0;
+    LLRunnable();
+    virtual ~LLRunnable();
+
+    /**
+     * @brief Do the process.
+     *
+     * This method will be called from the LLRunner according to
+     * @param runner The Runner which call run().
+     * @param handle The handle this run instance is run under.
+     */
+    virtual void run(LLRunner* runner, S64 handle) = 0;
 };
 
 #endif // LL_LLRUN_H