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

diff --git a/indra/llcommon/lllivefile.cpp b/indra/llcommon/lllivefile.cpp
index 852ddb45e9..3fe5f4bdb6 100644
--- a/indra/llcommon/lllivefile.cpp
+++ b/indra/llcommon/lllivefile.cpp
@@ -1,198 +1,198 @@
-/** 
- * @file lllivefile.cpp
- *
- * $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$
- */
-
-#include "linden_common.h"
-
-#include "lllivefile.h"
-#include "llframetimer.h"
-#include "lleventtimer.h"
-
-const F32 DEFAULT_CONFIG_FILE_REFRESH = 5.0f;
-
-
-class LLLiveFile::Impl
-{
-public:
-	Impl(const std::string& filename, const F32 refresh_period);
-	~Impl();
-	
-	bool check();
-	void changed();
-	
-	bool mForceCheck;
-	F32 mRefreshPeriod;
-	LLFrameTimer mRefreshTimer;
-
-	std::string mFilename;
-	time_t mLastModTime;
-	time_t mLastStatTime;
-	bool mLastExists;
-	
-	LLEventTimer* mEventTimer;
-private:
-    LOG_CLASS(LLLiveFile);
-};
-
-LLLiveFile::Impl::Impl(const std::string& filename, const F32 refresh_period)
-	:
-	mForceCheck(true),
-	mRefreshPeriod(refresh_period),
-	mFilename(filename),
-	mLastModTime(0),
-	mLastStatTime(0),
-	mLastExists(false),
-	mEventTimer(NULL)
-{
-}
-
-LLLiveFile::Impl::~Impl()
-{
-	delete mEventTimer;
-}
-
-LLLiveFile::LLLiveFile(const std::string& filename, const F32 refresh_period)
-	: impl(* new Impl(filename, refresh_period))
-{
-}
-
-LLLiveFile::~LLLiveFile()
-{
-	delete &impl;
-}
-
-
-bool LLLiveFile::Impl::check()
-{
-    bool detected_change = false;
-    // Skip the check if not enough time has elapsed and we're not
-    // forcing a check of the file
-	if (mForceCheck || mRefreshTimer.getElapsedTimeF32() >= mRefreshPeriod)
-	{
-        mForceCheck = false;   // force only forces one check
-        mRefreshTimer.reset(); // don't check again until mRefreshPeriod has passed
-
-        // Stat the file to see if it exists and when it was last modified.
-        llstat stat_data;
-        if (LLFile::stat(mFilename, &stat_data))
-        {
-            // Couldn't stat the file, that means it doesn't exist or is
-            // broken somehow.  
-            if (mLastExists)
-            {
-                mLastExists = false;
-                detected_change = true;	// no longer existing is a change!
-                LL_DEBUGS() << "detected deleted file '" << mFilename << "'" << LL_ENDL;
-            }
-        }
-        else
-        {
-            // The file exists
-            if ( ! mLastExists )
-            {
-                // last check, it did not exist - that counts as a change
-                LL_DEBUGS() << "detected created file '" << mFilename << "'" << LL_ENDL;
-                detected_change = true;
-            }
-            else if ( stat_data.st_mtime > mLastModTime )
-            {
-                // file modification time is newer than last check
-                LL_DEBUGS() << "detected updated file '" << mFilename << "'" << LL_ENDL;
-                detected_change = true;
-            }
-            mLastExists = true;
-            mLastStatTime = stat_data.st_mtime;
-        }
-    }
-    if (detected_change)
-    {
-        LL_INFOS() << "detected file change '" << mFilename << "'" << LL_ENDL;
-    }
-    return detected_change;
-}
-
-void LLLiveFile::Impl::changed()
-{
-	// we wanted to read this file, and we were successful.
-	mLastModTime = mLastStatTime;
-}
-
-bool LLLiveFile::checkAndReload()
-{
-	bool changed = impl.check();
-	if (changed)
-	{
-		if(loadFile())
-		{
-			impl.changed();
-			this->changed();
-		}
-		else
-		{
-			changed = false;
-		}
-	}
-	return changed;
-}
-
-std::string LLLiveFile::filename() const
-{
-	return impl.mFilename;
-}
-
-namespace
-{
-	class LiveFileEventTimer : public LLEventTimer
-	{
-	public:
-		LiveFileEventTimer(LLLiveFile& f, F32 refresh)
-			: LLEventTimer(refresh), mLiveFile(f)
-			{ }
-			
-		bool tick()
-		{
-			mLiveFile.checkAndReload(); 
-			return false;
-		}
-	
-	private:
-		LLLiveFile& mLiveFile;
-	};
-	
-}
-
-void LLLiveFile::addToEventTimer()
-{
-	impl.mEventTimer = new LiveFileEventTimer(*this, impl.mRefreshPeriod);
-}
-
-void LLLiveFile::setRefreshPeriod(F32 seconds)
-{
-	if (seconds < 0.f)
-	{
-		seconds = -seconds;
-	}
-	impl.mRefreshPeriod = seconds;
-}
-
+/**

+ * @file lllivefile.cpp

+ *

+ * $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$

+ */

+

+#include "linden_common.h"

+

+#include "lllivefile.h"

+#include "llframetimer.h"

+#include "lleventtimer.h"

+

+const F32 DEFAULT_CONFIG_FILE_REFRESH = 5.0f;

+

+

+class LLLiveFile::Impl

+{

+public:

+    Impl(const std::string& filename, const F32 refresh_period);

+    ~Impl();

+

+    bool check();

+    void changed();

+

+    bool mForceCheck;

+    F32 mRefreshPeriod;

+    LLFrameTimer mRefreshTimer;

+

+    std::string mFilename;

+    time_t mLastModTime;

+    time_t mLastStatTime;

+    bool mLastExists;

+

+    LLEventTimer* mEventTimer;

+private:

+    LOG_CLASS(LLLiveFile);

+};

+

+LLLiveFile::Impl::Impl(const std::string& filename, const F32 refresh_period)

+    :

+    mForceCheck(true),

+    mRefreshPeriod(refresh_period),

+    mFilename(filename),

+    mLastModTime(0),

+    mLastStatTime(0),

+    mLastExists(false),

+    mEventTimer(NULL)

+{

+}

+

+LLLiveFile::Impl::~Impl()

+{

+    delete mEventTimer;

+}

+

+LLLiveFile::LLLiveFile(const std::string& filename, const F32 refresh_period)

+    : impl(* new Impl(filename, refresh_period))

+{

+}

+

+LLLiveFile::~LLLiveFile()

+{

+    delete &impl;

+}

+

+

+bool LLLiveFile::Impl::check()

+{

+    bool detected_change = false;

+    // Skip the check if not enough time has elapsed and we're not

+    // forcing a check of the file

+    if (mForceCheck || mRefreshTimer.getElapsedTimeF32() >= mRefreshPeriod)

+    {

+        mForceCheck = false;   // force only forces one check

+        mRefreshTimer.reset(); // don't check again until mRefreshPeriod has passed

+

+        // Stat the file to see if it exists and when it was last modified.

+        llstat stat_data;

+        if (LLFile::stat(mFilename, &stat_data))

+        {

+            // Couldn't stat the file, that means it doesn't exist or is

+            // broken somehow.

+            if (mLastExists)

+            {

+                mLastExists = false;

+                detected_change = true; // no longer existing is a change!

+                LL_DEBUGS() << "detected deleted file '" << mFilename << "'" << LL_ENDL;

+            }

+        }

+        else

+        {

+            // The file exists

+            if ( ! mLastExists )

+            {

+                // last check, it did not exist - that counts as a change

+                LL_DEBUGS() << "detected created file '" << mFilename << "'" << LL_ENDL;

+                detected_change = true;

+            }

+            else if ( stat_data.st_mtime > mLastModTime )

+            {

+                // file modification time is newer than last check

+                LL_DEBUGS() << "detected updated file '" << mFilename << "'" << LL_ENDL;

+                detected_change = true;

+            }

+            mLastExists = true;

+            mLastStatTime = stat_data.st_mtime;

+        }

+    }

+    if (detected_change)

+    {

+        LL_INFOS() << "detected file change '" << mFilename << "'" << LL_ENDL;

+    }

+    return detected_change;

+}

+

+void LLLiveFile::Impl::changed()

+{

+    // we wanted to read this file, and we were successful.

+    mLastModTime = mLastStatTime;

+}

+

+bool LLLiveFile::checkAndReload()

+{

+    bool changed = impl.check();

+    if (changed)

+    {

+        if(loadFile())

+        {

+            impl.changed();

+            this->changed();

+        }

+        else

+        {

+            changed = false;

+        }

+    }

+    return changed;

+}

+

+std::string LLLiveFile::filename() const

+{

+    return impl.mFilename;

+}

+

+namespace

+{

+    class LiveFileEventTimer : public LLEventTimer

+    {

+    public:

+        LiveFileEventTimer(LLLiveFile& f, F32 refresh)

+            : LLEventTimer(refresh), mLiveFile(f)

+            { }

+

+        bool tick()

+        {

+            mLiveFile.checkAndReload();

+            return false;

+        }

+

+    private:

+        LLLiveFile& mLiveFile;

+    };

+

+}

+

+void LLLiveFile::addToEventTimer()

+{

+    impl.mEventTimer = new LiveFileEventTimer(*this, impl.mRefreshPeriod);

+}

+

+void LLLiveFile::setRefreshPeriod(F32 seconds)

+{

+    if (seconds < 0.f)

+    {

+        seconds = -seconds;

+    }

+    impl.mRefreshPeriod = seconds;

+}

+