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

diff --git a/indra/llcommon/lltimer.h b/indra/llcommon/lltimer.h
index 8fea02eb92..60eb007595 100644
--- a/indra/llcommon/lltimer.h
+++ b/indra/llcommon/lltimer.h
@@ -1,188 +1,188 @@
-/** 
- * @file lltimer.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_TIMER_H					
-#define LL_TIMER_H
-
-#if LL_LINUX || LL_DARWIN
-#include <sys/time.h>
-#endif
-#include <limits.h>
-
-#include "stdtypes.h"
-
-#include <string>
-#include <list>
-// units conversions
-#include "llunits.h"
-#ifndef USEC_PER_SEC
-    const U32	USEC_PER_SEC	= 1000000;
-#endif
-const U32	SEC_PER_MIN		= 60;
-const U32	MIN_PER_HOUR	= 60;
-const U32	USEC_PER_MIN	= USEC_PER_SEC * SEC_PER_MIN;
-const U32	USEC_PER_HOUR	= USEC_PER_MIN * MIN_PER_HOUR;
-const U32	SEC_PER_HOUR	= SEC_PER_MIN * MIN_PER_HOUR;
-const F64 	SEC_PER_USEC 	= 1.0 / (F64) USEC_PER_SEC;
-
-class LL_COMMON_API LLTimer 
-{
-public:
-	static LLTimer *sTimer;				// global timer
-	
-protected:	
-	U64 mLastClockCount;
-	U64 mExpirationTicks;
-	bool mStarted;
-
-public:
-	LLTimer();
-	~LLTimer();
-
-	static void initClass();
-	static void cleanupClass();
-
-	// Return a high precision number of seconds since the start of
-	// this application instance.
-	static F64SecondsImplicit getElapsedSeconds()
-	{
-		if (sTimer) 
-	{
-		return sTimer->getElapsedTimeF64();
-	}
-		else
-		{
-			return 0;
-		}
-	}
-
-	// Return a high precision usec since epoch
-	static U64MicrosecondsImplicit getTotalTime();
-
-	// Return a high precision seconds since epoch
-	static F64SecondsImplicit getTotalSeconds();
-
-
-	// MANIPULATORS
-	void start() { reset(); mStarted = true; }
-	void stop() { mStarted = false; }
-	void reset();								// Resets the timer
-	void setLastClockCount(U64 current_count);		// Sets the timer so that the next elapsed call will be relative to this time
-	void setTimerExpirySec(F32SecondsImplicit expiration);
-    bool checkExpirationAndReset(F32 expiration);
-    bool hasExpired() const;
-	F32SecondsImplicit getElapsedTimeAndResetF32();	// Returns elapsed time in seconds with reset
-	F64SecondsImplicit getElapsedTimeAndResetF64();
-
-	F32SecondsImplicit getRemainingTimeF32() const;
-
-	static bool knownBadTimer();
-
-	// ACCESSORS
-	F32SecondsImplicit getElapsedTimeF32() const;			// Returns elapsed time in seconds
-	F64SecondsImplicit getElapsedTimeF64() const;			// Returns elapsed time in seconds
-
-	bool getStarted() const { return mStarted; }
-
-
-	static U64 getCurrentClockCount();		// Returns the raw clockticks
-};
-
-//
-// Various functions for initializing/accessing clock and timing stuff.  Don't use these without REALLY knowing how they work.
-//
-struct TimerInfo
-{
-	TimerInfo();
-	void update();
-
-	F64HertzImplicit		mClockFrequency;
-	F64SecondsImplicit		mClockFrequencyInv;
-	F64MicrosecondsImplicit	mClocksToMicroseconds;
-	U64						mTotalTimeClockCount;
-	U64						mLastTotalTimeClockCount;
-};
-
-TimerInfo& get_timer_info();
-
-LL_COMMON_API U64 get_clock_count();
-
-// Sleep for milliseconds
-LL_COMMON_API void ms_sleep(U32 ms);
-LL_COMMON_API U32 micro_sleep(U64 us, U32 max_yields = 0xFFFFFFFF);
-
-// Returns the correct UTC time in seconds, like time(NULL).
-// Useful on the viewer, which may have its local clock set wrong.
-LL_COMMON_API time_t time_corrected();
-
-static inline time_t time_min()
-{
-	if (sizeof(time_t) == 4)
-	{
-		return (time_t) INT_MIN;
-	} else {
-#ifdef LLONG_MIN
-		return (time_t) LLONG_MIN;
-#else
-		return (time_t) LONG_MIN;
-#endif
-	}
-}
-
-static inline time_t time_max()
-{
-	if (sizeof(time_t) == 4)
-	{
-		return (time_t) INT_MAX;
-	} else {
-#ifdef LLONG_MAX
-		return (time_t) LLONG_MAX;
-#else
-		return (time_t) LONG_MAX;
-#endif
-	}
-}
-
-// Correction factor used by time_corrected() above.
-extern LL_COMMON_API S32 gUTCOffset;
-
-// Is the current computer (in its current time zone)
-// observing daylight savings time?
-LL_COMMON_API bool is_daylight_savings();
-
-// Converts internal "struct tm" time buffer to Pacific Standard/Daylight Time
-// Usage:
-// S32 utc_time;
-// utc_time = time_corrected();
-// struct tm* internal_time = utc_to_pacific_time(utc_time, gDaylight);
-LL_COMMON_API struct tm* utc_to_pacific_time(time_t utc_time, bool pacific_daylight_time);
-
-LL_COMMON_API void microsecondsToTimecodeString(U64MicrosecondsImplicit current_time, std::string& tcstring);
-LL_COMMON_API void secondsToTimecodeString(F32SecondsImplicit current_time, std::string& tcstring);
-
-U64MicrosecondsImplicit LL_COMMON_API totalTime();					// Returns current system time in microseconds
-
-#endif
+/**

+ * @file lltimer.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_TIMER_H

+#define LL_TIMER_H

+

+#if LL_LINUX || LL_DARWIN

+#include <sys/time.h>

+#endif

+#include <limits.h>

+

+#include "stdtypes.h"

+

+#include <string>

+#include <list>

+// units conversions

+#include "llunits.h"

+#ifndef USEC_PER_SEC

+    const U32   USEC_PER_SEC    = 1000000;

+#endif

+const U32   SEC_PER_MIN     = 60;

+const U32   MIN_PER_HOUR    = 60;

+const U32   USEC_PER_MIN    = USEC_PER_SEC * SEC_PER_MIN;

+const U32   USEC_PER_HOUR   = USEC_PER_MIN * MIN_PER_HOUR;

+const U32   SEC_PER_HOUR    = SEC_PER_MIN * MIN_PER_HOUR;

+const F64   SEC_PER_USEC    = 1.0 / (F64) USEC_PER_SEC;

+

+class LL_COMMON_API LLTimer

+{

+public:

+    static LLTimer *sTimer;             // global timer

+

+protected:

+    U64 mLastClockCount;

+    U64 mExpirationTicks;

+    bool mStarted;

+

+public:

+    LLTimer();

+    ~LLTimer();

+

+    static void initClass();

+    static void cleanupClass();

+

+    // Return a high precision number of seconds since the start of

+    // this application instance.

+    static F64SecondsImplicit getElapsedSeconds()

+    {

+        if (sTimer)

+    {

+        return sTimer->getElapsedTimeF64();

+    }

+        else

+        {

+            return 0;

+        }

+    }

+

+    // Return a high precision usec since epoch

+    static U64MicrosecondsImplicit getTotalTime();

+

+    // Return a high precision seconds since epoch

+    static F64SecondsImplicit getTotalSeconds();

+

+

+    // MANIPULATORS

+    void start() { reset(); mStarted = true; }

+    void stop() { mStarted = false; }

+    void reset();                               // Resets the timer

+    void setLastClockCount(U64 current_count);      // Sets the timer so that the next elapsed call will be relative to this time

+    void setTimerExpirySec(F32SecondsImplicit expiration);

+    bool checkExpirationAndReset(F32 expiration);

+    bool hasExpired() const;

+    F32SecondsImplicit getElapsedTimeAndResetF32(); // Returns elapsed time in seconds with reset

+    F64SecondsImplicit getElapsedTimeAndResetF64();

+

+    F32SecondsImplicit getRemainingTimeF32() const;

+

+    static bool knownBadTimer();

+

+    // ACCESSORS

+    F32SecondsImplicit getElapsedTimeF32() const;           // Returns elapsed time in seconds

+    F64SecondsImplicit getElapsedTimeF64() const;           // Returns elapsed time in seconds

+

+    bool getStarted() const { return mStarted; }

+

+

+    static U64 getCurrentClockCount();      // Returns the raw clockticks

+};

+

+//

+// Various functions for initializing/accessing clock and timing stuff.  Don't use these without REALLY knowing how they work.

+//

+struct TimerInfo

+{

+    TimerInfo();

+    void update();

+

+    F64HertzImplicit        mClockFrequency;

+    F64SecondsImplicit      mClockFrequencyInv;

+    F64MicrosecondsImplicit mClocksToMicroseconds;

+    U64                     mTotalTimeClockCount;

+    U64                     mLastTotalTimeClockCount;

+};

+

+TimerInfo& get_timer_info();

+

+LL_COMMON_API U64 get_clock_count();

+

+// Sleep for milliseconds

+LL_COMMON_API void ms_sleep(U32 ms);

+LL_COMMON_API U32 micro_sleep(U64 us, U32 max_yields = 0xFFFFFFFF);

+

+// Returns the correct UTC time in seconds, like time(NULL).

+// Useful on the viewer, which may have its local clock set wrong.

+LL_COMMON_API time_t time_corrected();

+

+static inline time_t time_min()

+{

+    if (sizeof(time_t) == 4)

+    {

+        return (time_t) INT_MIN;

+    } else {

+#ifdef LLONG_MIN

+        return (time_t) LLONG_MIN;

+#else

+        return (time_t) LONG_MIN;

+#endif

+    }

+}

+

+static inline time_t time_max()

+{

+    if (sizeof(time_t) == 4)

+    {

+        return (time_t) INT_MAX;

+    } else {

+#ifdef LLONG_MAX

+        return (time_t) LLONG_MAX;

+#else

+        return (time_t) LONG_MAX;

+#endif

+    }

+}

+

+// Correction factor used by time_corrected() above.

+extern LL_COMMON_API S32 gUTCOffset;

+

+// Is the current computer (in its current time zone)

+// observing daylight savings time?

+LL_COMMON_API bool is_daylight_savings();

+

+// Converts internal "struct tm" time buffer to Pacific Standard/Daylight Time

+// Usage:

+// S32 utc_time;

+// utc_time = time_corrected();

+// struct tm* internal_time = utc_to_pacific_time(utc_time, gDaylight);

+LL_COMMON_API struct tm* utc_to_pacific_time(time_t utc_time, bool pacific_daylight_time);

+

+LL_COMMON_API void microsecondsToTimecodeString(U64MicrosecondsImplicit current_time, std::string& tcstring);

+LL_COMMON_API void secondsToTimecodeString(F32SecondsImplicit current_time, std::string& tcstring);

+

+U64MicrosecondsImplicit LL_COMMON_API totalTime();                  // Returns current system time in microseconds

+

+#endif