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

diff --git a/indra/llmessage/lltaskname.h b/indra/llmessage/lltaskname.h
index 5dbd9c6223..413242dc05 100644
--- a/indra/llmessage/lltaskname.h
+++ b/indra/llmessage/lltaskname.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file lltaskname.h
  * @brief This contains the current list of valid tasks and is inluded
  * into both simulator and viewer
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2000&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$
  */
@@ -29,7 +29,7 @@
 #define LL_LLTASKNAME_H
 
 // Current valid tasks
-// If you add a taskname here you will have to 
+// If you add a taskname here you will have to
 // 1) Add an initializer to init_object() in llscript.cpp
 // 1.1) Add to object_type_to_task_name() in llregion.cpp
 // 2) Add display code to LLStupidObject::render2(LLAgent* agentp) in llstupidobject.cpp
@@ -37,24 +37,24 @@
 
 typedef enum e_lltask_name
 {
-	LLTASK_NULL				= 0, // Not a valid task
-	LLTASK_AGENT			= 1, // The player's agent in Linden World
-	LLTASK_CHILD_AGENT		= 2, // Child agents sent to adjacent regions
-//	LLTASK_BASIC_SHOT,		// Simple shot that moves in a straight line
-//	LLTASK_BIG_SHOT,		// Big shot that uses gravity
-	LLTASK_TREE				= 5, // A tree
-//	LLTASK_BIRD,			// a bird
-//	LLTASK_ATOR,			// a predator
-//	LLTASK_SMOKE,			// Smoke poof
-//	LLTASK_SPARK,			// Little spark
-//	LLTASK_ROCK,			// Rock
-	LLTASK_GRASS			= 11, // Grass
-	LLTASK_PSYS				= 12, // particle system test example 
-//	LLTASK_ORACLE,
-//	LLTASK_DEMON,			// Maxwell's demon
-//	LLTASK_LSL_TEST,		// Linden Scripting Language Test Object
-	LLTASK_PRIMITIVE		= 16,
-//	LLTASK_GHOST			= 17, // a ghost (Boo!)
-	LLTASK_TREE_NEW			= 18
+    LLTASK_NULL             = 0, // Not a valid task
+    LLTASK_AGENT            = 1, // The player's agent in Linden World
+    LLTASK_CHILD_AGENT      = 2, // Child agents sent to adjacent regions
+//  LLTASK_BASIC_SHOT,      // Simple shot that moves in a straight line
+//  LLTASK_BIG_SHOT,        // Big shot that uses gravity
+    LLTASK_TREE             = 5, // A tree
+//  LLTASK_BIRD,            // a bird
+//  LLTASK_ATOR,            // a predator
+//  LLTASK_SMOKE,           // Smoke poof
+//  LLTASK_SPARK,           // Little spark
+//  LLTASK_ROCK,            // Rock
+    LLTASK_GRASS            = 11, // Grass
+    LLTASK_PSYS             = 12, // particle system test example
+//  LLTASK_ORACLE,
+//  LLTASK_DEMON,           // Maxwell's demon
+//  LLTASK_LSL_TEST,        // Linden Scripting Language Test Object
+    LLTASK_PRIMITIVE        = 16,
+//  LLTASK_GHOST            = 17, // a ghost (Boo!)
+    LLTASK_TREE_NEW         = 18
 } ELLTaskName;
 #endif