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

diff --git a/indra/llcommon/llcallbacklist.cpp b/indra/llcommon/llcallbacklist.cpp
index a2800d42ce..9705b69e11 100644
--- a/indra/llcommon/llcallbacklist.cpp
+++ b/indra/llcommon/llcallbacklist.cpp
@@ -1,230 +1,230 @@
-/** 
- * @file llcallbacklist.cpp
- * @brief A simple list of callback functions to call.
- *
- * $LicenseInfo:firstyear=2001&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 "llcallbacklist.h"
-#include "lleventtimer.h"
-#include "llerrorlegacy.h"
-
-// Globals
-//
-LLCallbackList gIdleCallbacks;
-
-//
-// Member functions
-//
-
-LLCallbackList::LLCallbackList()
-{
-	// nothing
-}
-
-LLCallbackList::~LLCallbackList()
-{
-}
-
-
-void LLCallbackList::addFunction( callback_t func, void *data)
-{
-	if (!func)
-	{
-		return;
-	}
-
-	// only add one callback per func/data pair
-	//
-	if (containsFunction(func, data))
-	{
-		return;
-	}
-	
-	callback_pair_t t(func, data);
-	mCallbackList.push_back(t);
-}
-
-bool LLCallbackList::containsFunction( callback_t func, void *data)
-{
-	callback_pair_t t(func, data);
-	callback_list_t::iterator iter = find(func,data);
-	if (iter != mCallbackList.end())
-	{
-		return true;
-	}
-	else
-	{
-		return false;
-	}
-}
-
-
-bool LLCallbackList::deleteFunction( callback_t func, void *data)
-{
-	callback_list_t::iterator iter = find(func,data);
-	if (iter != mCallbackList.end())
-	{
-		mCallbackList.erase(iter);
-		return true;
-	}
-	else
-	{
-		return false;
-	}
-}
-
-inline 
-LLCallbackList::callback_list_t::iterator
-LLCallbackList::find(callback_t func, void *data)
-{
-	callback_pair_t t(func, data);
-	return std::find(mCallbackList.begin(), mCallbackList.end(), t);
-}
-
-void LLCallbackList::deleteAllFunctions()
-{
-	mCallbackList.clear();
-}
-
-
-void LLCallbackList::callFunctions()
-{
-	for (callback_list_t::iterator iter = mCallbackList.begin(); iter != mCallbackList.end(); )
-	{
-		callback_list_t::iterator curiter = iter++;
-		curiter->first(curiter->second);
-	}
-}
-
-// Shim class to allow arbitrary boost::bind
-// expressions to be run as one-time idle callbacks.
-class OnIdleCallbackOneTime
-{
-public:
-	OnIdleCallbackOneTime(nullary_func_t callable):
-		mCallable(callable)
-	{
-	}
-	static void onIdle(void *data)
-	{
-		gIdleCallbacks.deleteFunction(onIdle, data);
-		OnIdleCallbackOneTime* self = reinterpret_cast<OnIdleCallbackOneTime*>(data);
-		self->call();
-		delete self;
-	}
-	void call()
-	{
-		mCallable();
-	}
-private:
-	nullary_func_t mCallable;
-};
-
-void doOnIdleOneTime(nullary_func_t callable)
-{
-	OnIdleCallbackOneTime* cb_functor = new OnIdleCallbackOneTime(callable);
-	gIdleCallbacks.addFunction(&OnIdleCallbackOneTime::onIdle,cb_functor);
-}
-
-// Shim class to allow generic boost functions to be run as
-// recurring idle callbacks.  Callable should return true when done,
-// false to continue getting called.
-class OnIdleCallbackRepeating
-{
-public:
-	OnIdleCallbackRepeating(bool_func_t callable):
-		mCallable(callable)
-	{
-	}
-	// Will keep getting called until the callable returns true.
-	static void onIdle(void *data)
-	{
-		OnIdleCallbackRepeating* self = reinterpret_cast<OnIdleCallbackRepeating*>(data);
-		bool done = self->call();
-		if (done)
-		{
-			gIdleCallbacks.deleteFunction(onIdle, data);
-			delete self;
-		}
-	}
-	bool call()
-	{
-		return mCallable();
-	}
-private:
-	bool_func_t mCallable;
-};
-
-void doOnIdleRepeating(bool_func_t callable)
-{
-	OnIdleCallbackRepeating* cb_functor = new OnIdleCallbackRepeating(callable);
-	gIdleCallbacks.addFunction(&OnIdleCallbackRepeating::onIdle,cb_functor);
-}
-
-class NullaryFuncEventTimer: public LLEventTimer
-{
-public:
-	NullaryFuncEventTimer(nullary_func_t callable, F32 seconds):
-		LLEventTimer(seconds),
-		mCallable(callable)
-	{
-	}
-
-private:
-	bool tick()
-	{
-		mCallable();
-		return true;
-	}
-
-	nullary_func_t mCallable;
-};
-
-// Call a given callable once after specified interval.
-void doAfterInterval(nullary_func_t callable, F32 seconds)
-{
-	new NullaryFuncEventTimer(callable, seconds);
-}
-
-class BoolFuncEventTimer: public LLEventTimer
-{
-public:
-	BoolFuncEventTimer(bool_func_t callable, F32 seconds):
-		LLEventTimer(seconds),
-		mCallable(callable)
-	{
-	}
-private:
-	bool tick()
-	{
-		return mCallable();
-	}
-
-	bool_func_t mCallable;
-};
-
-// Call a given callable every specified number of seconds, until it returns true.
-void doPeriodically(bool_func_t callable, F32 seconds)
-{
-	new BoolFuncEventTimer(callable, seconds);
-}
+/**

+ * @file llcallbacklist.cpp

+ * @brief A simple list of callback functions to call.

+ *

+ * $LicenseInfo:firstyear=2001&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 "llcallbacklist.h"

+#include "lleventtimer.h"

+#include "llerrorlegacy.h"

+

+// Globals

+//

+LLCallbackList gIdleCallbacks;

+

+//

+// Member functions

+//

+

+LLCallbackList::LLCallbackList()

+{

+    // nothing

+}

+

+LLCallbackList::~LLCallbackList()

+{

+}

+

+

+void LLCallbackList::addFunction( callback_t func, void *data)

+{

+    if (!func)

+    {

+        return;

+    }

+

+    // only add one callback per func/data pair

+    //

+    if (containsFunction(func, data))

+    {

+        return;

+    }

+

+    callback_pair_t t(func, data);

+    mCallbackList.push_back(t);

+}

+

+bool LLCallbackList::containsFunction( callback_t func, void *data)

+{

+    callback_pair_t t(func, data);

+    callback_list_t::iterator iter = find(func,data);

+    if (iter != mCallbackList.end())

+    {

+        return true;

+    }

+    else

+    {

+        return false;

+    }

+}

+

+

+bool LLCallbackList::deleteFunction( callback_t func, void *data)

+{

+    callback_list_t::iterator iter = find(func,data);

+    if (iter != mCallbackList.end())

+    {

+        mCallbackList.erase(iter);

+        return true;

+    }

+    else

+    {

+        return false;

+    }

+}

+

+inline

+LLCallbackList::callback_list_t::iterator

+LLCallbackList::find(callback_t func, void *data)

+{

+    callback_pair_t t(func, data);

+    return std::find(mCallbackList.begin(), mCallbackList.end(), t);

+}

+

+void LLCallbackList::deleteAllFunctions()

+{

+    mCallbackList.clear();

+}

+

+

+void LLCallbackList::callFunctions()

+{

+    for (callback_list_t::iterator iter = mCallbackList.begin(); iter != mCallbackList.end(); )

+    {

+        callback_list_t::iterator curiter = iter++;

+        curiter->first(curiter->second);

+    }

+}

+

+// Shim class to allow arbitrary boost::bind

+// expressions to be run as one-time idle callbacks.

+class OnIdleCallbackOneTime

+{

+public:

+    OnIdleCallbackOneTime(nullary_func_t callable):

+        mCallable(callable)

+    {

+    }

+    static void onIdle(void *data)

+    {

+        gIdleCallbacks.deleteFunction(onIdle, data);

+        OnIdleCallbackOneTime* self = reinterpret_cast<OnIdleCallbackOneTime*>(data);

+        self->call();

+        delete self;

+    }

+    void call()

+    {

+        mCallable();

+    }

+private:

+    nullary_func_t mCallable;

+};

+

+void doOnIdleOneTime(nullary_func_t callable)

+{

+    OnIdleCallbackOneTime* cb_functor = new OnIdleCallbackOneTime(callable);

+    gIdleCallbacks.addFunction(&OnIdleCallbackOneTime::onIdle,cb_functor);

+}

+

+// Shim class to allow generic boost functions to be run as

+// recurring idle callbacks.  Callable should return true when done,

+// false to continue getting called.

+class OnIdleCallbackRepeating

+{

+public:

+    OnIdleCallbackRepeating(bool_func_t callable):

+        mCallable(callable)

+    {

+    }

+    // Will keep getting called until the callable returns true.

+    static void onIdle(void *data)

+    {

+        OnIdleCallbackRepeating* self = reinterpret_cast<OnIdleCallbackRepeating*>(data);

+        bool done = self->call();

+        if (done)

+        {

+            gIdleCallbacks.deleteFunction(onIdle, data);

+            delete self;

+        }

+    }

+    bool call()

+    {

+        return mCallable();

+    }

+private:

+    bool_func_t mCallable;

+};

+

+void doOnIdleRepeating(bool_func_t callable)

+{

+    OnIdleCallbackRepeating* cb_functor = new OnIdleCallbackRepeating(callable);

+    gIdleCallbacks.addFunction(&OnIdleCallbackRepeating::onIdle,cb_functor);

+}

+

+class NullaryFuncEventTimer: public LLEventTimer

+{

+public:

+    NullaryFuncEventTimer(nullary_func_t callable, F32 seconds):

+        LLEventTimer(seconds),

+        mCallable(callable)

+    {

+    }

+

+private:

+    bool tick()

+    {

+        mCallable();

+        return true;

+    }

+

+    nullary_func_t mCallable;

+};

+

+// Call a given callable once after specified interval.

+void doAfterInterval(nullary_func_t callable, F32 seconds)

+{

+    new NullaryFuncEventTimer(callable, seconds);

+}

+

+class BoolFuncEventTimer: public LLEventTimer

+{

+public:

+    BoolFuncEventTimer(bool_func_t callable, F32 seconds):

+        LLEventTimer(seconds),

+        mCallable(callable)

+    {

+    }

+private:

+    bool tick()

+    {

+        return mCallable();

+    }

+

+    bool_func_t mCallable;

+};

+

+// Call a given callable every specified number of seconds, until it returns true.

+void doPeriodically(bool_func_t callable, F32 seconds)

+{

+    new BoolFuncEventTimer(callable, seconds);

+}