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

diff --git a/indra/llcommon/lleventtimer.h b/indra/llcommon/lleventtimer.h
index 9bd34915a5..20c5fe7a82 100644
--- a/indra/llcommon/lleventtimer.h
+++ b/indra/llcommon/lleventtimer.h
@@ -1,122 +1,122 @@
-/** 
- * @file lleventtimer.h
- * @brief Cross-platform objects for doing timing 
- *
- * $LicenseInfo:firstyear=2000&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$
- */
-
-#ifndef LL_EVENTTIMER_H					
-#define LL_EVENTTIMER_H
-
-#include "stdtypes.h"
-#include "lldate.h"
-#include "llinstancetracker.h"
-#include "lltimer.h"
-
-// class for scheduling a function to be called at a given frequency (approximate, inprecise)
-class LL_COMMON_API LLEventTimer : public LLInstanceTracker<LLEventTimer>
-{
-public:
-
-	LLEventTimer(F32 period);	// period is the amount of time between each call to tick() in seconds
-	LLEventTimer(const LLDate& time);
-	virtual ~LLEventTimer();
-
-	//function to be called at the supplied frequency
-	// Normally return FALSE; TRUE will delete the timer after the function returns.
-	virtual bool tick() = 0;
-
-	static void updateClass();
-
-	/// Schedule recurring calls to generic callable every period seconds.
-	/// Returns a pointer; if you delete it, cancels the recurring calls.
-	template <typename CALLABLE>
-	static LLEventTimer* run_every(F32 period, const CALLABLE& callable);
-
-	/// Schedule a future call to generic callable. Returns a pointer.
-	/// CAUTION: The object referenced by that pointer WILL BE DELETED once
-	/// the callback has been called! LLEventTimer::getInstance(pointer) (NOT
-	/// pointer->getInstance(pointer)!) can be used to test whether the
-	/// pointer is still valid. If it is, deleting it will cancel the
-	/// callback.
-	template <typename CALLABLE>
-	static LLEventTimer* run_at(const LLDate& time, const CALLABLE& callable);
-
-	/// Like run_at(), but after a time delta rather than at a timestamp.
-	/// Same CAUTION.
-	template <typename CALLABLE>
-	static LLEventTimer* run_after(F32 interval, const CALLABLE& callable);
-
-protected:
-	LLTimer mEventTimer;
-	F32 mPeriod;
-
-private:
-	template <typename CALLABLE>
-	class Generic;
-};
-
-template <typename CALLABLE>
-class LLEventTimer::Generic: public LLEventTimer
-{
-public:
-    // making TIME generic allows engaging either LLEventTimer constructor
-    template <typename TIME>
-    Generic(const TIME& time, bool once, const CALLABLE& callable):
-        LLEventTimer(time),
-        mOnce(once),
-        mCallable(callable)
-    {}
-    bool tick() override
-    {
-        mCallable();
-        // true tells updateClass() to delete this instance
-        return mOnce;
-    }
-
-private:
-    bool mOnce;
-    CALLABLE mCallable;
-};
-
-template <typename CALLABLE>
-LLEventTimer* LLEventTimer::run_every(F32 period, const CALLABLE& callable)
-{
-    // return false to schedule recurring calls
-    return new Generic<CALLABLE>(period, false, callable);
-}
-
-template <typename CALLABLE>
-LLEventTimer* LLEventTimer::run_at(const LLDate& time, const CALLABLE& callable)
-{
-    // return true for one-shot callback
-    return new Generic<CALLABLE>(time, true, callable);
-}
-
-template <typename CALLABLE>
-LLEventTimer* LLEventTimer::run_after(F32 interval, const CALLABLE& callable)
-{
-    // one-shot callback after specified interval
-    return new Generic<CALLABLE>(interval, true, callable);
-}
-
-#endif //LL_EVENTTIMER_H
+/**

+ * @file lleventtimer.h

+ * @brief Cross-platform objects for doing timing

+ *

+ * $LicenseInfo:firstyear=2000&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$

+ */

+

+#ifndef LL_EVENTTIMER_H

+#define LL_EVENTTIMER_H

+

+#include "stdtypes.h"

+#include "lldate.h"

+#include "llinstancetracker.h"

+#include "lltimer.h"

+

+// class for scheduling a function to be called at a given frequency (approximate, inprecise)

+class LL_COMMON_API LLEventTimer : public LLInstanceTracker<LLEventTimer>

+{

+public:

+

+    LLEventTimer(F32 period);   // period is the amount of time between each call to tick() in seconds

+    LLEventTimer(const LLDate& time);

+    virtual ~LLEventTimer();

+

+    //function to be called at the supplied frequency

+    // Normally return FALSE; TRUE will delete the timer after the function returns.

+    virtual bool tick() = 0;

+

+    static void updateClass();

+

+    /// Schedule recurring calls to generic callable every period seconds.

+    /// Returns a pointer; if you delete it, cancels the recurring calls.

+    template <typename CALLABLE>

+    static LLEventTimer* run_every(F32 period, const CALLABLE& callable);

+

+    /// Schedule a future call to generic callable. Returns a pointer.

+    /// CAUTION: The object referenced by that pointer WILL BE DELETED once

+    /// the callback has been called! LLEventTimer::getInstance(pointer) (NOT

+    /// pointer->getInstance(pointer)!) can be used to test whether the

+    /// pointer is still valid. If it is, deleting it will cancel the

+    /// callback.

+    template <typename CALLABLE>

+    static LLEventTimer* run_at(const LLDate& time, const CALLABLE& callable);

+

+    /// Like run_at(), but after a time delta rather than at a timestamp.

+    /// Same CAUTION.

+    template <typename CALLABLE>

+    static LLEventTimer* run_after(F32 interval, const CALLABLE& callable);

+

+protected:

+    LLTimer mEventTimer;

+    F32 mPeriod;

+

+private:

+    template <typename CALLABLE>

+    class Generic;

+};

+

+template <typename CALLABLE>

+class LLEventTimer::Generic: public LLEventTimer

+{

+public:

+    // making TIME generic allows engaging either LLEventTimer constructor

+    template <typename TIME>

+    Generic(const TIME& time, bool once, const CALLABLE& callable):

+        LLEventTimer(time),

+        mOnce(once),

+        mCallable(callable)

+    {}

+    bool tick() override

+    {

+        mCallable();

+        // true tells updateClass() to delete this instance

+        return mOnce;

+    }

+

+private:

+    bool mOnce;

+    CALLABLE mCallable;

+};

+

+template <typename CALLABLE>

+LLEventTimer* LLEventTimer::run_every(F32 period, const CALLABLE& callable)

+{

+    // return false to schedule recurring calls

+    return new Generic<CALLABLE>(period, false, callable);

+}

+

+template <typename CALLABLE>

+LLEventTimer* LLEventTimer::run_at(const LLDate& time, const CALLABLE& callable)

+{

+    // return true for one-shot callback

+    return new Generic<CALLABLE>(time, true, callable);

+}

+

+template <typename CALLABLE>

+LLEventTimer* LLEventTimer::run_after(F32 interval, const CALLABLE& callable)

+{

+    // one-shot callback after specified interval

+    return new Generic<CALLABLE>(interval, true, callable);

+}

+

+#endif //LL_EVENTTIMER_H