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

diff --git a/indra/llmessage/tests/lltemplatemessagedispatcher_test.cpp b/indra/llmessage/tests/lltemplatemessagedispatcher_test.cpp
index 3f87a4aff6..d0a34d720a 100644
--- a/indra/llmessage/tests/lltemplatemessagedispatcher_test.cpp
+++ b/indra/llmessage/tests/lltemplatemessagedispatcher_test.cpp
@@ -1,160 +1,160 @@
-/**
- * @file lltrustedmessageservice_test.cpp
- * @brief LLTrustedMessageService unit tests
- *
- * $LicenseInfo:firstyear=2009&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 "lltemplatemessagedispatcher.h"
-#include "lltut.h"
-
-#include "llhttpnode.h"
-#include "llhost.h"
-#include "message.h"
-#include "llsd.h"
-#include "llpounceable.h"
-
-#include "llhost.cpp" // Needed for copy operator
-#include "net.cpp" // Needed by LLHost.
-
-LLPounceable<LLMessageSystem*, LLPounceableStatic> gMessageSystem;
-
-// sensor test doubles
-bool gClearRecvWasCalled = false;
-void LLMessageSystem::clearReceiveState(void) 
-{ 
-	gClearRecvWasCalled = true; 
-}
-
-char gUdpDispatchedData[MAX_BUFFER_SIZE];
-bool gUdpDispatchWasCalled = false;
-bool LLTemplateMessageReader::readMessage(const U8* data,class LLHost const &)
-{
-	gUdpDispatchWasCalled = true;
-	strcpy(gUdpDispatchedData, reinterpret_cast<const char*>(data));
-	return  true;
-}
-
-bool gValidateMessage = false;
-bool LLTemplateMessageReader::validateMessage(const U8*, S32 buffer_size, LLHost const &sender, bool trusted)
-{
-	return gValidateMessage;
-}
-
-LLHost host;
-const LLHost& LLMessageSystem::getSender() const 
-{ 
-	return host; 
-}
-
-const char* gBinaryTemplateData = "BINARYTEMPLATEDATA";
-void fillVector(std::vector<U8>& vector_data, const char* data)
-{
-	vector_data.resize(strlen(data) + 1);
-	strcpy(reinterpret_cast<char*>(&vector_data[0]), data);
-}
-
-namespace tut
-{
-		static LLTemplateMessageReader::message_template_number_map_t numberMap;
-
-		struct LLTemplateMessageDispatcherData
-		{
-			LLTemplateMessageDispatcherData()
-			{
-				mMessageName = "MessageName";
-				gUdpDispatchWasCalled = false;
-				gClearRecvWasCalled = false;
-				gValidateMessage = false;
-				mMessage["body"]["binary-template-data"] = std::vector<U8>();
-			}
-
-			LLSD mMessage;
-			LLHTTPNode::ResponsePtr mResponsePtr;
-			std::string mMessageName;
-		};
-
-	typedef test_group<LLTemplateMessageDispatcherData> factory;
-	typedef factory::object object;
-}
-
-namespace
-{
-	tut::factory tf("LLTemplateMessageDispatcher");
-}
-
-namespace tut
-{
-	// does an empty message stop processing?
-	template<> template<>
-	void object::test<1>()
-	{
-		LLTemplateMessageReader* pReader = NULL;
-		LLTemplateMessageDispatcher t(*pReader);
-		t.dispatch(mMessageName, mMessage, mResponsePtr);
-		ensure(! gUdpDispatchWasCalled);
-		ensure(! gClearRecvWasCalled);
-	}
-
-	// does the disaptch invoke the udp send method?
-	template<> template<>
-	void object::test<2>()
-	{
-		LLTemplateMessageReader* pReader = NULL;
-		LLTemplateMessageDispatcher t(*pReader);
-		gValidateMessage = true;
-		std::vector<U8> vector_data;
-		fillVector(vector_data, gBinaryTemplateData);		
-		mMessage["body"]["binary-template-data"] = vector_data;
-		t.dispatch(mMessageName, mMessage, mResponsePtr);
-		ensure("udp dispatch was called", gUdpDispatchWasCalled);
-	}
-
-	// what if the message wasn't valid? We would hope the message gets cleared!
-	template<> template<>
-	void object::test<3>()
-	{
-		LLTemplateMessageReader* pReader = NULL;
-		LLTemplateMessageDispatcher t(*pReader);
-		std::vector<U8> vector_data;
-		fillVector(vector_data, gBinaryTemplateData);
-		mMessage["body"]["binary-template-data"] = vector_data;
-		gValidateMessage = false;
-		t.dispatch(mMessageName, mMessage, mResponsePtr);
-		ensure("clear received message was called", gClearRecvWasCalled);
-	}
-
-	// is the binary data passed through correctly?
-	template<> template<>
-	void object::test<4>()
-	{
-		LLTemplateMessageReader* pReader = NULL;
-		LLTemplateMessageDispatcher t(*pReader);
-		gValidateMessage = true;
-		std::vector<U8> vector_data;
-		fillVector(vector_data, gBinaryTemplateData);
-		mMessage["body"]["binary-template-data"] = vector_data;
-		t.dispatch(mMessageName, mMessage, mResponsePtr);
-		ensure("data couriered correctly", strcmp(gBinaryTemplateData, gUdpDispatchedData) == 0);
-	}
-}
-
+/**

+ * @file lltrustedmessageservice_test.cpp

+ * @brief LLTrustedMessageService unit tests

+ *

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

+#include "lltut.h"

+

+#include "llhttpnode.h"

+#include "llhost.h"

+#include "message.h"

+#include "llsd.h"

+#include "llpounceable.h"

+

+#include "llhost.cpp" // Needed for copy operator

+#include "net.cpp" // Needed by LLHost.

+

+LLPounceable<LLMessageSystem*, LLPounceableStatic> gMessageSystem;

+

+// sensor test doubles

+bool gClearRecvWasCalled = false;

+void LLMessageSystem::clearReceiveState(void)

+{

+    gClearRecvWasCalled = true;

+}

+

+char gUdpDispatchedData[MAX_BUFFER_SIZE];

+bool gUdpDispatchWasCalled = false;

+bool LLTemplateMessageReader::readMessage(const U8* data,class LLHost const &)

+{

+    gUdpDispatchWasCalled = true;

+    strcpy(gUdpDispatchedData, reinterpret_cast<const char*>(data));

+    return  true;

+}

+

+bool gValidateMessage = false;

+bool LLTemplateMessageReader::validateMessage(const U8*, S32 buffer_size, LLHost const &sender, bool trusted)

+{

+    return gValidateMessage;

+}

+

+LLHost host;

+const LLHost& LLMessageSystem::getSender() const

+{

+    return host;

+}

+

+const char* gBinaryTemplateData = "BINARYTEMPLATEDATA";

+void fillVector(std::vector<U8>& vector_data, const char* data)

+{

+    vector_data.resize(strlen(data) + 1);

+    strcpy(reinterpret_cast<char*>(&vector_data[0]), data);

+}

+

+namespace tut

+{

+        static LLTemplateMessageReader::message_template_number_map_t numberMap;

+

+        struct LLTemplateMessageDispatcherData

+        {

+            LLTemplateMessageDispatcherData()

+            {

+                mMessageName = "MessageName";

+                gUdpDispatchWasCalled = false;

+                gClearRecvWasCalled = false;

+                gValidateMessage = false;

+                mMessage["body"]["binary-template-data"] = std::vector<U8>();

+            }

+

+            LLSD mMessage;

+            LLHTTPNode::ResponsePtr mResponsePtr;

+            std::string mMessageName;

+        };

+

+    typedef test_group<LLTemplateMessageDispatcherData> factory;

+    typedef factory::object object;

+}

+

+namespace

+{

+    tut::factory tf("LLTemplateMessageDispatcher");

+}

+

+namespace tut

+{

+    // does an empty message stop processing?

+    template<> template<>

+    void object::test<1>()

+    {

+        LLTemplateMessageReader* pReader = NULL;

+        LLTemplateMessageDispatcher t(*pReader);

+        t.dispatch(mMessageName, mMessage, mResponsePtr);

+        ensure(! gUdpDispatchWasCalled);

+        ensure(! gClearRecvWasCalled);

+    }

+

+    // does the disaptch invoke the udp send method?

+    template<> template<>

+    void object::test<2>()

+    {

+        LLTemplateMessageReader* pReader = NULL;

+        LLTemplateMessageDispatcher t(*pReader);

+        gValidateMessage = true;

+        std::vector<U8> vector_data;

+        fillVector(vector_data, gBinaryTemplateData);

+        mMessage["body"]["binary-template-data"] = vector_data;

+        t.dispatch(mMessageName, mMessage, mResponsePtr);

+        ensure("udp dispatch was called", gUdpDispatchWasCalled);

+    }

+

+    // what if the message wasn't valid? We would hope the message gets cleared!

+    template<> template<>

+    void object::test<3>()

+    {

+        LLTemplateMessageReader* pReader = NULL;

+        LLTemplateMessageDispatcher t(*pReader);

+        std::vector<U8> vector_data;

+        fillVector(vector_data, gBinaryTemplateData);

+        mMessage["body"]["binary-template-data"] = vector_data;

+        gValidateMessage = false;

+        t.dispatch(mMessageName, mMessage, mResponsePtr);

+        ensure("clear received message was called", gClearRecvWasCalled);

+    }

+

+    // is the binary data passed through correctly?

+    template<> template<>

+    void object::test<4>()

+    {

+        LLTemplateMessageReader* pReader = NULL;

+        LLTemplateMessageDispatcher t(*pReader);

+        gValidateMessage = true;

+        std::vector<U8> vector_data;

+        fillVector(vector_data, gBinaryTemplateData);

+        mMessage["body"]["binary-template-data"] = vector_data;

+        t.dispatch(mMessageName, mMessage, mResponsePtr);

+        ensure("data couriered correctly", strcmp(gBinaryTemplateData, gUdpDispatchedData) == 0);

+    }

+}

+