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

diff --git a/indra/llmessage/llteleportflags.h b/indra/llmessage/llteleportflags.h
index fd1e702832..36f9e8e2c8 100644
--- a/indra/llmessage/llteleportflags.h
+++ b/indra/llmessage/llteleportflags.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llteleportflags.h
  * @brief Teleport flags
  *
  * $LicenseInfo:firstyear=2002&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$
  */
@@ -27,39 +27,39 @@
 #ifndef LL_LLTELEPORTFLAGS_H
 #define LL_LLTELEPORTFLAGS_H
 
-const U32 TELEPORT_FLAGS_DEFAULT 			= 0;
-const U32 TELEPORT_FLAGS_SET_HOME_TO_TARGET	= 1 << 0;	// newbie leaving prelude
-const U32 TELEPORT_FLAGS_SET_LAST_TO_TARGET	= 1 << 1;
-const U32 TELEPORT_FLAGS_VIA_LURE 			= 1 << 2;
-const U32 TELEPORT_FLAGS_VIA_LANDMARK 		= 1 << 3;
-const U32 TELEPORT_FLAGS_VIA_LOCATION		= 1 << 4;
-const U32 TELEPORT_FLAGS_VIA_HOME			= 1 << 5;
-const U32 TELEPORT_FLAGS_VIA_TELEHUB		= 1 << 6;
-const U32 TELEPORT_FLAGS_VIA_LOGIN			= 1 << 7;
-const U32 TELEPORT_FLAGS_VIA_GODLIKE_LURE	= 1 << 8;
-const U32 TELEPORT_FLAGS_GODLIKE 			= 1 << 9;
-const U32 TELEPORT_FLAGS_911 				= 1 << 10;
-const U32 TELEPORT_FLAGS_DISABLE_CANCEL		= 1 << 11;	// Used for llTeleportAgentHome()
-const U32 TELEPORT_FLAGS_VIA_REGION_ID  	= 1 << 12;
-const U32 TELEPORT_FLAGS_IS_FLYING			= 1 << 13;
-const U32 TELEPORT_FLAGS_SHOW_RESET_HOME	= 1 << 14;
-const U32 TELEPORT_FLAGS_FORCE_REDIRECT		= 1 << 15; // used to force a redirect to some random location - used when kicking someone from land.
-const U32 TELEPORT_FLAGS_VIA_GLOBAL_COORDS	= 1 << 16;
-const U32 TELEPORT_FLAGS_WITHIN_REGION		= 1 << 17;
+const U32 TELEPORT_FLAGS_DEFAULT            = 0;
+const U32 TELEPORT_FLAGS_SET_HOME_TO_TARGET = 1 << 0;   // newbie leaving prelude
+const U32 TELEPORT_FLAGS_SET_LAST_TO_TARGET = 1 << 1;
+const U32 TELEPORT_FLAGS_VIA_LURE           = 1 << 2;
+const U32 TELEPORT_FLAGS_VIA_LANDMARK       = 1 << 3;
+const U32 TELEPORT_FLAGS_VIA_LOCATION       = 1 << 4;
+const U32 TELEPORT_FLAGS_VIA_HOME           = 1 << 5;
+const U32 TELEPORT_FLAGS_VIA_TELEHUB        = 1 << 6;
+const U32 TELEPORT_FLAGS_VIA_LOGIN          = 1 << 7;
+const U32 TELEPORT_FLAGS_VIA_GODLIKE_LURE   = 1 << 8;
+const U32 TELEPORT_FLAGS_GODLIKE            = 1 << 9;
+const U32 TELEPORT_FLAGS_911                = 1 << 10;
+const U32 TELEPORT_FLAGS_DISABLE_CANCEL     = 1 << 11;  // Used for llTeleportAgentHome()
+const U32 TELEPORT_FLAGS_VIA_REGION_ID      = 1 << 12;
+const U32 TELEPORT_FLAGS_IS_FLYING          = 1 << 13;
+const U32 TELEPORT_FLAGS_SHOW_RESET_HOME    = 1 << 14;
+const U32 TELEPORT_FLAGS_FORCE_REDIRECT     = 1 << 15; // used to force a redirect to some random location - used when kicking someone from land.
+const U32 TELEPORT_FLAGS_VIA_GLOBAL_COORDS  = 1 << 16;
+const U32 TELEPORT_FLAGS_WITHIN_REGION      = 1 << 17;
+
+const U32 TELEPORT_FLAGS_MASK_VIA =   TELEPORT_FLAGS_VIA_LURE
+                                    | TELEPORT_FLAGS_VIA_LANDMARK
+                                    | TELEPORT_FLAGS_VIA_LOCATION
+                                    | TELEPORT_FLAGS_VIA_HOME
+                                    | TELEPORT_FLAGS_VIA_TELEHUB
+                                    | TELEPORT_FLAGS_VIA_LOGIN
+                                    | TELEPORT_FLAGS_VIA_REGION_ID;
 
-const U32 TELEPORT_FLAGS_MASK_VIA =   TELEPORT_FLAGS_VIA_LURE 
-									| TELEPORT_FLAGS_VIA_LANDMARK
-									| TELEPORT_FLAGS_VIA_LOCATION
-									| TELEPORT_FLAGS_VIA_HOME
-									| TELEPORT_FLAGS_VIA_TELEHUB
-									| TELEPORT_FLAGS_VIA_LOGIN
-									| TELEPORT_FLAGS_VIA_REGION_ID;
-	
 
 
 
-const U32 LURE_FLAG_NORMAL_LURE  	= 1 << 0;
-const U32 LURE_FLAG_GODLIKE_LURE 	= 1 << 1;
+const U32 LURE_FLAG_NORMAL_LURE     = 1 << 0;
+const U32 LURE_FLAG_GODLIKE_LURE    = 1 << 1;
 const U32 LURE_FLAG_GODLIKE_PURSUIT = 1 << 2;
 
 #endif