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

diff --git a/indra/newview/tests/llremoteparcelrequest_test.cpp b/indra/newview/tests/llremoteparcelrequest_test.cpp
index 4eddfb46e1..c8fa2fbd6f 100644
--- a/indra/newview/tests/llremoteparcelrequest_test.cpp
+++ b/indra/newview/tests/llremoteparcelrequest_test.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llremoteparcelrequest_test.cpp
  * @author Brad Kittenbrink <brad@lindenlab.com>
  *
  * $LicenseInfo:firstyear=2010&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$
  */
@@ -37,7 +37,7 @@
 #include "llpounceable.h"
 
 namespace {
-	const LLUUID TEST_PARCEL_ID("11111111-1111-1111-1111-111111111111");
+    const LLUUID TEST_PARCEL_ID("11111111-1111-1111-1111-111111111111");
 }
 
 LLCurl::Responder::Responder() { }
@@ -56,7 +56,7 @@ void LLMessageSystem::getS32(char const *,char const *,S32 &,S32) { }
 void LLMessageSystem::getString(char const *,char const *, std::string &,S32) { }
 void LLMessageSystem::getUUID(char const *,char const *, LLUUID & out_id,S32)
 {
-	out_id = TEST_PARCEL_ID;
+    out_id = TEST_PARCEL_ID;
 }
 void LLMessageSystem::nextBlock(char const *) { }
 void LLMessageSystem::addUUID(char const *,LLUUID const &) { }
@@ -79,61 +79,61 @@ void LLUrlEntryParcel::processParcelInfo(const LLUrlEntryParcel::LLParcelData& p
 
 namespace tut
 {
-	struct TestObserver : public LLRemoteParcelInfoObserver {
-		TestObserver() : mProcessed(false) { }
+    struct TestObserver : public LLRemoteParcelInfoObserver {
+        TestObserver() : mProcessed(false) { }
 
-		virtual void processParcelInfo(const LLParcelData& parcel_data)
-		{
-			mProcessed = true;
-		}
+        virtual void processParcelInfo(const LLParcelData& parcel_data)
+        {
+            mProcessed = true;
+        }
 
-		virtual void setParcelID(const LLUUID& parcel_id) { }
+        virtual void setParcelID(const LLUUID& parcel_id) { }
 
-		virtual void setErrorStatus(S32 status, const std::string& reason) { }
+        virtual void setErrorStatus(S32 status, const std::string& reason) { }
 
-		bool mProcessed;
-	};
+        bool mProcessed;
+    };
 
     struct RemoteParcelRequestData
     {
-		RemoteParcelRequestData()
-		{
-		}
+        RemoteParcelRequestData()
+        {
+        }
     };
-    
-	typedef test_group<RemoteParcelRequestData> remoteparcelrequest_t;
-	typedef remoteparcelrequest_t::object remoteparcelrequest_object_t;
-	tut::remoteparcelrequest_t tut_remoteparcelrequest("LLRemoteParcelRequest");
 
-	template<> template<>
-	void remoteparcelrequest_object_t::test<1>()
-	{
-		set_test_name("observer pointer");
+    typedef test_group<RemoteParcelRequestData> remoteparcelrequest_t;
+    typedef remoteparcelrequest_t::object remoteparcelrequest_object_t;
+    tut::remoteparcelrequest_t tut_remoteparcelrequest("LLRemoteParcelRequest");
+
+    template<> template<>
+    void remoteparcelrequest_object_t::test<1>()
+    {
+        set_test_name("observer pointer");
 
-		std::unique_ptr<TestObserver> observer(new TestObserver());
+        std::unique_ptr<TestObserver> observer(new TestObserver());
 
-		LLRemoteParcelInfoProcessor & processor = LLRemoteParcelInfoProcessor::instance();
-		processor.addObserver(LLUUID(TEST_PARCEL_ID), observer.get());
+        LLRemoteParcelInfoProcessor & processor = LLRemoteParcelInfoProcessor::instance();
+        processor.addObserver(LLUUID(TEST_PARCEL_ID), observer.get());
 
-		processor.processParcelInfoReply(gMessageSystem, NULL);
+        processor.processParcelInfoReply(gMessageSystem, NULL);
 
-		ensure(observer->mProcessed);
-	}
+        ensure(observer->mProcessed);
+    }
 
-	template<> template<>
-	void remoteparcelrequest_object_t::test<2>()
-	{
-		set_test_name("CHOP-220: dangling observer pointer");
+    template<> template<>
+    void remoteparcelrequest_object_t::test<2>()
+    {
+        set_test_name("CHOP-220: dangling observer pointer");
 
-		LLRemoteParcelInfoObserver * observer = new TestObserver();
+        LLRemoteParcelInfoObserver * observer = new TestObserver();
 
-		LLRemoteParcelInfoProcessor & processor = LLRemoteParcelInfoProcessor::instance();
-		processor.addObserver(LLUUID(TEST_PARCEL_ID), observer);
+        LLRemoteParcelInfoProcessor & processor = LLRemoteParcelInfoProcessor::instance();
+        processor.addObserver(LLUUID(TEST_PARCEL_ID), observer);
 
-		delete observer;
-		observer = NULL;
+        delete observer;
+        observer = NULL;
 
-		processor.processParcelInfoReply(gMessageSystem, NULL);
-	}
+        processor.processParcelInfoReply(gMessageSystem, NULL);
+    }
 }
 #endif