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

diff --git a/indra/llcommon/llframetimer.cpp b/indra/llcommon/llframetimer.cpp
index 024ef27228..8694129c77 100644
--- a/indra/llcommon/llframetimer.cpp
+++ b/indra/llcommon/llframetimer.cpp
@@ -1,150 +1,150 @@
-/** 
- * @file llframetimer.cpp
- *
- * $LicenseInfo:firstyear=2002&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$
- */
-
-#include "linden_common.h"
-
-#include "u64.h"
-
-#include "llframetimer.h"
-
-// Static members
-//LLTimer	LLFrameTimer::sInternalTimer;
-U64 LLFrameTimer::sStartTotalTime = totalTime();
-F64 LLFrameTimer::sFrameTime = 0.0;
-U64 LLFrameTimer::sTotalTime = 0;
-F64 LLFrameTimer::sTotalSeconds = 0.0;
-S32 LLFrameTimer::sFrameCount = 0;
-U64 LLFrameTimer::sFrameDeltaTime = 0;
-const F64 USEC_TO_SEC_F64 = 0.000001;
-
-// static
-void LLFrameTimer::updateFrameTime()
-{
-	U64 total_time = totalTime();
-	sFrameDeltaTime = total_time - sTotalTime;
-	sTotalTime = total_time;
-	sTotalSeconds = U64_to_F64(sTotalTime) * USEC_TO_SEC_F64;
-	sFrameTime = U64_to_F64(sTotalTime - sStartTotalTime) * USEC_TO_SEC_F64;
-} 
-
-void LLFrameTimer::start()
-{
-	reset();
-	mStarted = true;
-}
-
-void LLFrameTimer::stop()
-{
-	mStarted = false;
-}
-
-void LLFrameTimer::reset()
-{
-	mStartTime = sFrameTime;
-	mExpiry = sFrameTime;
-}
-
-void LLFrameTimer::resetWithExpiry(F32 expiration)
-{
-	reset();
-	setTimerExpirySec(expiration);
-}
-
-// Don't combine pause/unpause with start/stop
-// Useage:
-//  LLFrameTime foo; // starts automatically
-//  foo.unpause(); // noop but safe
-//  foo.pause(); // pauses timer
-//  foo.unpause() // unpauses
-//  F32 elapsed = foo.getElapsedTimeF32() // does not include time between pause() and unpause()
-//  Note: elapsed would also be valid with no unpause() call (= time run until pause() called)
-void LLFrameTimer::pause()
-{
-	if (mStarted)
-		mStartTime = sFrameTime - mStartTime; // save dtime
-	mStarted = false;
-}
-
-void LLFrameTimer::unpause()
-{
-	if (!mStarted)
-		mStartTime = sFrameTime - mStartTime; // restore dtime
-	mStarted = true;
-}
-
-void LLFrameTimer::setTimerExpirySec(F32 expiration)
-{
-	mExpiry = expiration + mStartTime;
-}
-
-void LLFrameTimer::setExpiryAt(F64 seconds_since_epoch)
-{
-	mStartTime = sFrameTime;
-	mExpiry = seconds_since_epoch - (USEC_TO_SEC_F64 * sStartTotalTime);
-}
-
-F64 LLFrameTimer::expiresAt() const
-{
-	F64 expires_at = U64_to_F64(sStartTotalTime) * USEC_TO_SEC_F64;
-	expires_at += mExpiry;
-	return expires_at;
-}
-
-bool LLFrameTimer::checkExpirationAndReset(F32 expiration)
-{
-	//LL_INFOS() << "LLFrameTimer::checkExpirationAndReset()" << LL_ENDL;
-	//LL_INFOS() << "  mStartTime:" << mStartTime << LL_ENDL;
-	//LL_INFOS() << "  sFrameTime:" << sFrameTime << LL_ENDL;
-	//LL_INFOS() << "  mExpiry:   " <<  mExpiry << LL_ENDL;
-
-	if(hasExpired())
-	{
-		reset();
-		setTimerExpirySec(expiration);
-		return true;
-	}
-	return false;
-}
-
-// static
-F32 LLFrameTimer::getFrameDeltaTimeF32()
-{
-	return (F32)(U64_to_F64(sFrameDeltaTime) * USEC_TO_SEC_F64); 
-}
-
-
-//	static 
-// Return seconds since the current frame started
-F32  LLFrameTimer::getCurrentFrameTime()
-{
-	U64 frame_time = totalTime() - sTotalTime;
-	return (F32)(U64_to_F64(frame_time) * USEC_TO_SEC_F64); 
-}
-
-// Glue code to avoid full class .h file #includes
-F32  getCurrentFrameTime()
-{
-	return (F32)(LLFrameTimer::getCurrentFrameTime());
-}
+/**

+ * @file llframetimer.cpp

+ *

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

+ */

+

+#include "linden_common.h"

+

+#include "u64.h"

+

+#include "llframetimer.h"

+

+// Static members

+//LLTimer   LLFrameTimer::sInternalTimer;

+U64 LLFrameTimer::sStartTotalTime = totalTime();

+F64 LLFrameTimer::sFrameTime = 0.0;

+U64 LLFrameTimer::sTotalTime = 0;

+F64 LLFrameTimer::sTotalSeconds = 0.0;

+S32 LLFrameTimer::sFrameCount = 0;

+U64 LLFrameTimer::sFrameDeltaTime = 0;

+const F64 USEC_TO_SEC_F64 = 0.000001;

+

+// static

+void LLFrameTimer::updateFrameTime()

+{

+    U64 total_time = totalTime();

+    sFrameDeltaTime = total_time - sTotalTime;

+    sTotalTime = total_time;

+    sTotalSeconds = U64_to_F64(sTotalTime) * USEC_TO_SEC_F64;

+    sFrameTime = U64_to_F64(sTotalTime - sStartTotalTime) * USEC_TO_SEC_F64;

+}

+

+void LLFrameTimer::start()

+{

+    reset();

+    mStarted = true;

+}

+

+void LLFrameTimer::stop()

+{

+    mStarted = false;

+}

+

+void LLFrameTimer::reset()

+{

+    mStartTime = sFrameTime;

+    mExpiry = sFrameTime;

+}

+

+void LLFrameTimer::resetWithExpiry(F32 expiration)

+{

+    reset();

+    setTimerExpirySec(expiration);

+}

+

+// Don't combine pause/unpause with start/stop

+// Useage:

+//  LLFrameTime foo; // starts automatically

+//  foo.unpause(); // noop but safe

+//  foo.pause(); // pauses timer

+//  foo.unpause() // unpauses

+//  F32 elapsed = foo.getElapsedTimeF32() // does not include time between pause() and unpause()

+//  Note: elapsed would also be valid with no unpause() call (= time run until pause() called)

+void LLFrameTimer::pause()

+{

+    if (mStarted)

+        mStartTime = sFrameTime - mStartTime; // save dtime

+    mStarted = false;

+}

+

+void LLFrameTimer::unpause()

+{

+    if (!mStarted)

+        mStartTime = sFrameTime - mStartTime; // restore dtime

+    mStarted = true;

+}

+

+void LLFrameTimer::setTimerExpirySec(F32 expiration)

+{

+    mExpiry = expiration + mStartTime;

+}

+

+void LLFrameTimer::setExpiryAt(F64 seconds_since_epoch)

+{

+    mStartTime = sFrameTime;

+    mExpiry = seconds_since_epoch - (USEC_TO_SEC_F64 * sStartTotalTime);

+}

+

+F64 LLFrameTimer::expiresAt() const

+{

+    F64 expires_at = U64_to_F64(sStartTotalTime) * USEC_TO_SEC_F64;

+    expires_at += mExpiry;

+    return expires_at;

+}

+

+bool LLFrameTimer::checkExpirationAndReset(F32 expiration)

+{

+    //LL_INFOS() << "LLFrameTimer::checkExpirationAndReset()" << LL_ENDL;

+    //LL_INFOS() << "  mStartTime:" << mStartTime << LL_ENDL;

+    //LL_INFOS() << "  sFrameTime:" << sFrameTime << LL_ENDL;

+    //LL_INFOS() << "  mExpiry:   " <<  mExpiry << LL_ENDL;

+

+    if(hasExpired())

+    {

+        reset();

+        setTimerExpirySec(expiration);

+        return true;

+    }

+    return false;

+}

+

+// static

+F32 LLFrameTimer::getFrameDeltaTimeF32()

+{

+    return (F32)(U64_to_F64(sFrameDeltaTime) * USEC_TO_SEC_F64);

+}

+

+

+//  static

+// Return seconds since the current frame started

+F32  LLFrameTimer::getCurrentFrameTime()

+{

+    U64 frame_time = totalTime() - sTotalTime;

+    return (F32)(U64_to_F64(frame_time) * USEC_TO_SEC_F64);

+}

+

+// Glue code to avoid full class .h file #includes

+F32  getCurrentFrameTime()

+{

+    return (F32)(LLFrameTimer::getCurrentFrameTime());

+}