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

diff --git a/indra/llmessage/llclassifiedflags.h b/indra/llmessage/llclassifiedflags.h
index 9298b90357..126b23340f 100644
--- a/indra/llmessage/llclassifiedflags.h
+++ b/indra/llmessage/llclassifiedflags.h
@@ -1,62 +1,62 @@
-/** 
- * @file llclassifiedflags.h
- * @brief Flags used in the classifieds.
- *
- * $LicenseInfo:firstyear=2005&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$
- */
-
-#ifndef LL_LLCLASSIFIEDFLAGS_H
-#define LL_LLCLASSIFIEDFLAGS_H
-
-typedef U8 ClassifiedFlags;
-
-const U8 CLASSIFIED_FLAG_NONE   	= 1 << 0;
-const U8 CLASSIFIED_FLAG_MATURE 	= 1 << 1;
-//const U8 CLASSIFIED_FLAG_ENABLED	= 1 << 2; // see llclassifiedflags.cpp
-//const U8 CLASSIFIED_FLAG_HAS_PRICE= 1 << 3; // deprecated
-const U8 CLASSIFIED_FLAG_UPDATE_TIME= 1 << 4;
-const U8 CLASSIFIED_FLAG_AUTO_RENEW = 1 << 5;
-
-const U8 CLASSIFIED_QUERY_FILTER_MATURE		= 1 << 1;
-//const U8 CLASSIFIED_QUERY_FILTER_ENABLED	= 1 << 2;
-//const U8 CLASSIFIED_QUERY_FILTER_PRICE	= 1 << 3;
-
-// These are new with Adult-enabled viewers (1.23 and later)
-const U8 CLASSIFIED_QUERY_INC_PG			= 1 << 2;
-const U8 CLASSIFIED_QUERY_INC_MATURE		= 1 << 3;
-const U8 CLASSIFIED_QUERY_INC_ADULT			= 1 << 6;
-const U8 CLASSIFIED_QUERY_INC_NEW_VIEWER	= (CLASSIFIED_QUERY_INC_PG | CLASSIFIED_QUERY_INC_MATURE | CLASSIFIED_QUERY_INC_ADULT);
-
-const S32 MAX_CLASSIFIEDS = 100;
-
-// This function is used in AO viewers to pack old query flags into the request 
-// so that they can talk to old dataservers properly. When the AO servers are deployed on agni
-// we can revert back to ClassifiedFlags pack_classified_flags and get rider of this one.
-ClassifiedFlags pack_classified_flags_request(bool auto_renew, bool is_pg, bool is_mature, bool is_adult);
-
-ClassifiedFlags pack_classified_flags(bool auto_renew, bool is_pg, bool is_mature, bool is_adult);
-bool is_cf_mature(ClassifiedFlags flags);
-//bool is_cf_enabled(ClassifiedFlags flags);
-bool is_cf_update_time(ClassifiedFlags flags);
-bool is_cf_auto_renew(ClassifiedFlags flags);
-
-#endif
+/**

+ * @file llclassifiedflags.h

+ * @brief Flags used in the classifieds.

+ *

+ * $LicenseInfo:firstyear=2005&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$

+ */

+

+#ifndef LL_LLCLASSIFIEDFLAGS_H

+#define LL_LLCLASSIFIEDFLAGS_H

+

+typedef U8 ClassifiedFlags;

+

+const U8 CLASSIFIED_FLAG_NONE       = 1 << 0;

+const U8 CLASSIFIED_FLAG_MATURE     = 1 << 1;

+//const U8 CLASSIFIED_FLAG_ENABLED  = 1 << 2; // see llclassifiedflags.cpp

+//const U8 CLASSIFIED_FLAG_HAS_PRICE= 1 << 3; // deprecated

+const U8 CLASSIFIED_FLAG_UPDATE_TIME= 1 << 4;

+const U8 CLASSIFIED_FLAG_AUTO_RENEW = 1 << 5;

+

+const U8 CLASSIFIED_QUERY_FILTER_MATURE     = 1 << 1;

+//const U8 CLASSIFIED_QUERY_FILTER_ENABLED  = 1 << 2;

+//const U8 CLASSIFIED_QUERY_FILTER_PRICE    = 1 << 3;

+

+// These are new with Adult-enabled viewers (1.23 and later)

+const U8 CLASSIFIED_QUERY_INC_PG            = 1 << 2;

+const U8 CLASSIFIED_QUERY_INC_MATURE        = 1 << 3;

+const U8 CLASSIFIED_QUERY_INC_ADULT         = 1 << 6;

+const U8 CLASSIFIED_QUERY_INC_NEW_VIEWER    = (CLASSIFIED_QUERY_INC_PG | CLASSIFIED_QUERY_INC_MATURE | CLASSIFIED_QUERY_INC_ADULT);

+

+const S32 MAX_CLASSIFIEDS = 100;

+

+// This function is used in AO viewers to pack old query flags into the request

+// so that they can talk to old dataservers properly. When the AO servers are deployed on agni

+// we can revert back to ClassifiedFlags pack_classified_flags and get rider of this one.

+ClassifiedFlags pack_classified_flags_request(bool auto_renew, bool is_pg, bool is_mature, bool is_adult);

+

+ClassifiedFlags pack_classified_flags(bool auto_renew, bool is_pg, bool is_mature, bool is_adult);

+bool is_cf_mature(ClassifiedFlags flags);

+//bool is_cf_enabled(ClassifiedFlags flags);

+bool is_cf_update_time(ClassifiedFlags flags);

+bool is_cf_auto_renew(ClassifiedFlags flags);

+

+#endif