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

diff --git a/indra/llmessage/llqueryflags.h b/indra/llmessage/llqueryflags.h
index 14a62de04f..227d28ba5c 100644
--- a/indra/llmessage/llqueryflags.h
+++ b/indra/llmessage/llqueryflags.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llqueryflags.h
  * @brief Flags for directory queries
  *
  * $LicenseInfo:firstyear=2003&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$
  */
@@ -30,73 +30,73 @@
 // Binary flags used for Find queries, shared between viewer and dataserver.
 
 // DirFindQuery flags
-const U32 DFQ_PEOPLE			= 0x1 << 0;
-const U32 DFQ_ONLINE			= 0x1 << 1;
-//const U32 DFQ_PLACES			= 0x1 << 2;
-const U32 DFQ_EVENTS			= 0x1 << 3; // This is not set by the 1.21 viewer, but I don't know about older versions. JC
-const U32 DFQ_GROUPS			= 0x1 << 4;
-const U32 DFQ_DATE_EVENTS		= 0x1 << 5;
+const U32 DFQ_PEOPLE            = 0x1 << 0;
+const U32 DFQ_ONLINE            = 0x1 << 1;
+//const U32 DFQ_PLACES          = 0x1 << 2;
+const U32 DFQ_EVENTS            = 0x1 << 3; // This is not set by the 1.21 viewer, but I don't know about older versions. JC
+const U32 DFQ_GROUPS            = 0x1 << 4;
+const U32 DFQ_DATE_EVENTS       = 0x1 << 5;
 
-const U32 DFQ_AGENT_OWNED		= 0x1 << 6;
-const U32 DFQ_FOR_SALE			= 0x1 << 7;
-const U32 DFQ_GROUP_OWNED		= 0x1 << 8;
-//const U32 DFQ_AUCTION			= 0x1 << 9;
-const U32 DFQ_DWELL_SORT		= 0x1 << 10;
-const U32 DFQ_PG_SIMS_ONLY		= 0x1 << 11;
-const U32 DFQ_PICTURES_ONLY		= 0x1 << 12;
-const U32 DFQ_PG_EVENTS_ONLY	= 0x1 << 13;
+const U32 DFQ_AGENT_OWNED       = 0x1 << 6;
+const U32 DFQ_FOR_SALE          = 0x1 << 7;
+const U32 DFQ_GROUP_OWNED       = 0x1 << 8;
+//const U32 DFQ_AUCTION         = 0x1 << 9;
+const U32 DFQ_DWELL_SORT        = 0x1 << 10;
+const U32 DFQ_PG_SIMS_ONLY      = 0x1 << 11;
+const U32 DFQ_PICTURES_ONLY     = 0x1 << 12;
+const U32 DFQ_PG_EVENTS_ONLY    = 0x1 << 13;
 const U32 DFQ_MATURE_SIMS_ONLY  = 0x1 << 14;
 
-const U32 DFQ_SORT_ASC			= 0x1 << 15;
-const U32 DFQ_PRICE_SORT		= 0x1 << 16;
-const U32 DFQ_PER_METER_SORT	= 0x1 << 17;
-const U32 DFQ_AREA_SORT			= 0x1 << 18;
-const U32 DFQ_NAME_SORT			= 0x1 << 19;
+const U32 DFQ_SORT_ASC          = 0x1 << 15;
+const U32 DFQ_PRICE_SORT        = 0x1 << 16;
+const U32 DFQ_PER_METER_SORT    = 0x1 << 17;
+const U32 DFQ_AREA_SORT         = 0x1 << 18;
+const U32 DFQ_NAME_SORT         = 0x1 << 19;
 
-const U32 DFQ_LIMIT_BY_PRICE	= 0x1 << 20;
-const U32 DFQ_LIMIT_BY_AREA		= 0x1 << 21;
+const U32 DFQ_LIMIT_BY_PRICE    = 0x1 << 20;
+const U32 DFQ_LIMIT_BY_AREA     = 0x1 << 21;
 
-const U32 DFQ_FILTER_MATURE		= 0x1 << 22;
-const U32 DFQ_PG_PARCELS_ONLY	= 0x1 << 23;
+const U32 DFQ_FILTER_MATURE     = 0x1 << 22;
+const U32 DFQ_PG_PARCELS_ONLY   = 0x1 << 23;
 
-const U32 DFQ_INC_PG		 	= 0x1 << 24;	// Flags appear in 1.23 viewer or later
-const U32 DFQ_INC_MATURE     	= 0x1 << 25;
-const U32 DFQ_INC_ADULT     	= 0x1 << 26;
-const U32 DFQ_INC_NEW_VIEWER	= (DFQ_INC_PG | DFQ_INC_MATURE | DFQ_INC_ADULT);	// Indicates 1.23 viewer or later
+const U32 DFQ_INC_PG            = 0x1 << 24;    // Flags appear in 1.23 viewer or later
+const U32 DFQ_INC_MATURE        = 0x1 << 25;
+const U32 DFQ_INC_ADULT         = 0x1 << 26;
+const U32 DFQ_INC_NEW_VIEWER    = (DFQ_INC_PG | DFQ_INC_MATURE | DFQ_INC_ADULT);    // Indicates 1.23 viewer or later
 
-const U32 DFQ_ADULT_SIMS_ONLY	= 0x1 << 27;
+const U32 DFQ_ADULT_SIMS_ONLY   = 0x1 << 27;
 
 // Sell Type flags
-const U32 ST_AUCTION	= 0x1 << 1;
-const U32 ST_NEWBIE		= 0x1 << 2;
-const U32 ST_MAINLAND	= 0x1 << 3;
-const U32 ST_ESTATE		= 0x1 << 4;
+const U32 ST_AUCTION    = 0x1 << 1;
+const U32 ST_NEWBIE     = 0x1 << 2;
+const U32 ST_MAINLAND   = 0x1 << 3;
+const U32 ST_ESTATE     = 0x1 << 4;
 
-const U32 ST_ALL		= 0xFFFFFFFF;
+const U32 ST_ALL        = 0xFFFFFFFF;
 
 // status flags embedded in search replay messages of classifieds, events, groups, and places.
 // Places
-const U32 STATUS_SEARCH_PLACES_NONE				= 0x0;
-const U32 STATUS_SEARCH_PLACES_BANNEDWORD		= 0x1 << 0;
-const U32 STATUS_SEARCH_PLACES_SHORTSTRING		= 0x1 << 1;
-const U32 STATUS_SEARCH_PLACES_FOUNDNONE		= 0x1 << 2;
-const U32 STATUS_SEARCH_PLACES_SEARCHDISABLED	= 0x1 << 3;
-const U32 STATUS_SEARCH_PLACES_ESTATEEMPTY		= 0x1 << 4;
+const U32 STATUS_SEARCH_PLACES_NONE             = 0x0;
+const U32 STATUS_SEARCH_PLACES_BANNEDWORD       = 0x1 << 0;
+const U32 STATUS_SEARCH_PLACES_SHORTSTRING      = 0x1 << 1;
+const U32 STATUS_SEARCH_PLACES_FOUNDNONE        = 0x1 << 2;
+const U32 STATUS_SEARCH_PLACES_SEARCHDISABLED   = 0x1 << 3;
+const U32 STATUS_SEARCH_PLACES_ESTATEEMPTY      = 0x1 << 4;
 // Events
-const U32 STATUS_SEARCH_EVENTS_NONE				= 0x0;
-const U32 STATUS_SEARCH_EVENTS_BANNEDWORD		= 0x1 << 0;
-const U32 STATUS_SEARCH_EVENTS_SHORTSTRING		= 0x1 << 1;
-const U32 STATUS_SEARCH_EVENTS_FOUNDNONE		= 0x1 << 2;
-const U32 STATUS_SEARCH_EVENTS_SEARCHDISABLED	= 0x1 << 3;
-const U32 STATUS_SEARCH_EVENTS_NODATEOFFSET		= 0x1 << 4;
-const U32 STATUS_SEARCH_EVENTS_NOCATEGORY		= 0x1 << 5;
-const U32 STATUS_SEARCH_EVENTS_NOQUERY		= 0x1 << 6;
+const U32 STATUS_SEARCH_EVENTS_NONE             = 0x0;
+const U32 STATUS_SEARCH_EVENTS_BANNEDWORD       = 0x1 << 0;
+const U32 STATUS_SEARCH_EVENTS_SHORTSTRING      = 0x1 << 1;
+const U32 STATUS_SEARCH_EVENTS_FOUNDNONE        = 0x1 << 2;
+const U32 STATUS_SEARCH_EVENTS_SEARCHDISABLED   = 0x1 << 3;
+const U32 STATUS_SEARCH_EVENTS_NODATEOFFSET     = 0x1 << 4;
+const U32 STATUS_SEARCH_EVENTS_NOCATEGORY       = 0x1 << 5;
+const U32 STATUS_SEARCH_EVENTS_NOQUERY      = 0x1 << 6;
 
 //Classifieds
-const U32 STATUS_SEARCH_CLASSIFIEDS_NONE			= 0x0;
-const U32 STATUS_SEARCH_CLASSIFIEDS_BANNEDWORD		= 0x1 << 0;
-const U32 STATUS_SEARCH_CLASSIFIEDS_SHORTSTRING		= 0x1 << 1;
-const U32 STATUS_SEARCH_CLASSIFIEDS_FOUNDNONE		= 0x1 << 2;
-const U32 STATUS_SEARCH_CLASSIFIEDS_SEARCHDISABLED	= 0x1 << 3;
+const U32 STATUS_SEARCH_CLASSIFIEDS_NONE            = 0x0;
+const U32 STATUS_SEARCH_CLASSIFIEDS_BANNEDWORD      = 0x1 << 0;
+const U32 STATUS_SEARCH_CLASSIFIEDS_SHORTSTRING     = 0x1 << 1;
+const U32 STATUS_SEARCH_CLASSIFIEDS_FOUNDNONE       = 0x1 << 2;
+const U32 STATUS_SEARCH_CLASSIFIEDS_SEARCHDISABLED  = 0x1 << 3;
 
 #endif