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

diff --git a/indra/test/mock_http_client.h b/indra/test/mock_http_client.h
index a2b9b435fb..ef268abc6e 100644
--- a/indra/test/mock_http_client.h
+++ b/indra/test/mock_http_client.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file mock_http_client.cpp
  * @brief Framework for testing HTTP requests
  *
  * $LicenseInfo:firstyear=2007&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$
  */
@@ -33,158 +33,158 @@
 
 namespace tut
 {
-	struct MockHttpClient
-	{
-	public:
-		MockHttpClient()
-		{
-			apr_pool_create(&mPool, NULL);
-			mServerPump = new LLPumpIO(mPool);
-			mClientPump = new LLPumpIO(mPool);
-			
-			LLHTTPClient::setPump(*mClientPump);
-		}
-		
-		~MockHttpClient()
-		{
-			delete mServerPump;
-			delete mClientPump;
-			apr_pool_destroy(mPool);
-		}
-
-		void setupTheServer()
-		{
-			LLHTTPNode& root = LLIOHTTPServer::create(mPool, *mServerPump, 8888);
-
-			LLHTTPStandardServices::useServices();
-			LLHTTPRegistrar::buildAllServices(root);
-		}
-		
-		void runThePump(float timeout = 100.0f)
-		{
-			LLTimer timer;
-			timer.setTimerExpirySec(timeout);
-
-			while(!mSawCompleted && !timer.hasExpired())
-			{
-				if (mServerPump)
-				{
-					mServerPump->pump();
-					mServerPump->callback();
-				}
-				if (mClientPump)
-				{
-					mClientPump->pump();
-					mClientPump->callback();
-				}
-			}
-		}
-
-		void killServer()
-		{
-			delete mServerPump;
-			mServerPump = NULL;
-		}
-	
-	private:
-		apr_pool_t* mPool;
-		LLPumpIO* mServerPump;
-		LLPumpIO* mClientPump;
-
-		
-	protected:
-		void ensureStatusOK()
-		{
-			if (mSawError)
-			{
-				std::string msg =
-					llformat("httpFailure() called when not expected, status %d",
-						mStatus); 
-				fail(msg);
-			}
-		}
-	
-		void ensureStatusError()
-		{
-			if (!mSawError)
-			{
-				fail("httpFailure() wasn't called");
-			}
-		}
-		
-		LLSD getResult()
-		{
-			return mResult;
-		}
-	
-	protected:
-		bool mSawError;
-		S32 mStatus;
-		std::string mReason;
-		bool mSawCompleted;
-		LLSD mResult;
-		bool mResultDeleted;
-
-		class Result : public LLHTTPClient::Responder
-		{
-		protected:
-			Result(MockHttpClient& client)
-				: mClient(client)
-			{
-			}
-		
-		public:
-			static boost::intrusive_ptr<Result> build(MockHttpClient& client)
-			{
-				return boost::intrusive_ptr<Result>(new Result(client));
-			}
-			
-			~Result()
-			{
-				mClient.mResultDeleted = true;
-			}
-			
-		protected:
-			virtual void httpFailure()
-			{
-				mClient.mSawError = true;
-				mClient.mStatus = getStatus();
-				mClient.mReason = getReason();
-			}
-
-			virtual void httpSuccess()
-			{
-				mClient.mResult = getContent();
-			}
-
-			virtual void httpCompleted()
-			{
-				LLHTTPClient::Responder::httpCompleted();
-				
-				mClient.mSawCompleted = true;
-			}
-
-		private:
-			MockHttpClient& mClient;
-		};
-
-		friend class Result;
-
-	protected:
-
-		void reset()
-		{
-			mSawError = false;
-			mStatus = 0;
-			mSawCompleted = false;
-			mResult.clear();
-			mResultDeleted = false;
-		}
-
-		LLHTTPClient::ResponderPtr newResult()
-		{
-			reset();
-			return Result::build(*this);
-		}
-	};
+    struct MockHttpClient
+    {
+    public:
+        MockHttpClient()
+        {
+            apr_pool_create(&mPool, NULL);
+            mServerPump = new LLPumpIO(mPool);
+            mClientPump = new LLPumpIO(mPool);
+
+            LLHTTPClient::setPump(*mClientPump);
+        }
+
+        ~MockHttpClient()
+        {
+            delete mServerPump;
+            delete mClientPump;
+            apr_pool_destroy(mPool);
+        }
+
+        void setupTheServer()
+        {
+            LLHTTPNode& root = LLIOHTTPServer::create(mPool, *mServerPump, 8888);
+
+            LLHTTPStandardServices::useServices();
+            LLHTTPRegistrar::buildAllServices(root);
+        }
+
+        void runThePump(float timeout = 100.0f)
+        {
+            LLTimer timer;
+            timer.setTimerExpirySec(timeout);
+
+            while(!mSawCompleted && !timer.hasExpired())
+            {
+                if (mServerPump)
+                {
+                    mServerPump->pump();
+                    mServerPump->callback();
+                }
+                if (mClientPump)
+                {
+                    mClientPump->pump();
+                    mClientPump->callback();
+                }
+            }
+        }
+
+        void killServer()
+        {
+            delete mServerPump;
+            mServerPump = NULL;
+        }
+
+    private:
+        apr_pool_t* mPool;
+        LLPumpIO* mServerPump;
+        LLPumpIO* mClientPump;
+
+
+    protected:
+        void ensureStatusOK()
+        {
+            if (mSawError)
+            {
+                std::string msg =
+                    llformat("httpFailure() called when not expected, status %d",
+                        mStatus);
+                fail(msg);
+            }
+        }
+
+        void ensureStatusError()
+        {
+            if (!mSawError)
+            {
+                fail("httpFailure() wasn't called");
+            }
+        }
+
+        LLSD getResult()
+        {
+            return mResult;
+        }
+
+    protected:
+        bool mSawError;
+        S32 mStatus;
+        std::string mReason;
+        bool mSawCompleted;
+        LLSD mResult;
+        bool mResultDeleted;
+
+        class Result : public LLHTTPClient::Responder
+        {
+        protected:
+            Result(MockHttpClient& client)
+                : mClient(client)
+            {
+            }
+
+        public:
+            static boost::intrusive_ptr<Result> build(MockHttpClient& client)
+            {
+                return boost::intrusive_ptr<Result>(new Result(client));
+            }
+
+            ~Result()
+            {
+                mClient.mResultDeleted = true;
+            }
+
+        protected:
+            virtual void httpFailure()
+            {
+                mClient.mSawError = true;
+                mClient.mStatus = getStatus();
+                mClient.mReason = getReason();
+            }
+
+            virtual void httpSuccess()
+            {
+                mClient.mResult = getContent();
+            }
+
+            virtual void httpCompleted()
+            {
+                LLHTTPClient::Responder::httpCompleted();
+
+                mClient.mSawCompleted = true;
+            }
+
+        private:
+            MockHttpClient& mClient;
+        };
+
+        friend class Result;
+
+    protected:
+
+        void reset()
+        {
+            mSawError = false;
+            mStatus = 0;
+            mSawCompleted = false;
+            mResult.clear();
+            mResultDeleted = false;
+        }
+
+        LLHTTPClient::ResponderPtr newResult()
+        {
+            reset();
+            return Result::build(*this);
+        }
+    };
 }