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

diff --git a/indra/newview/llpipelinelistener.cpp b/indra/newview/llpipelinelistener.cpp
index f11cdcf876..df65e94b48 100644
--- a/indra/newview/llpipelinelistener.cpp
+++ b/indra/newview/llpipelinelistener.cpp
@@ -3,25 +3,25 @@
  * @author Don Kjer
  * @date   2012-07-09
  * @brief  Implementation for LLPipelineListener
- * 
+ *
  * $LicenseInfo:firstyear=2012&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2012, 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$
  */
@@ -38,179 +38,179 @@
 
 
 namespace {
-	// Render Types
-	void toggle_render_types_wrapper(LLSD const& request)
-	{
-		for (LLSD::array_const_iterator iter = request["types"].beginArray();
-			iter != request["types"].endArray();
-			++iter)
-		{
-			U32 render_type = render_type_from_string( iter->asString() );
-			if ( render_type != 0 )
-			{
-				LLPipeline::toggleRenderTypeControl( render_type );
-			}
-		}
-	}
-
-	void has_render_type_wrapper(LLSD const& request)
-	{
-		LLEventAPI::Response response(LLSD(), request);
-		U32 render_type = render_type_from_string( request["type"].asString() );
-		if ( render_type != 0 )
-		{
-			response["value"] = LLPipeline::hasRenderTypeControl( render_type );
-		}
-		else
-		{
-			response.error(STRINGIZE("unknown type '" << request["type"].asString() << "'"));
-		}
-	}
-
-	void disable_all_render_types_wrapper(LLSD const& request)
-	{
-		gPipeline.clearAllRenderTypes();
-	}
-
-	void enable_all_render_types_wrapper(LLSD const& request)
-	{
-		gPipeline.setAllRenderTypes();
-	}
-
-	// Render Features
-	void toggle_render_features_wrapper(LLSD const& request)
-	{
-		for (LLSD::array_const_iterator iter = request["features"].beginArray();
-			iter != request["features"].endArray();
-			++iter)
-		{
-			U32 render_feature = feature_from_string( iter->asString() );
-			if ( render_feature != 0 )
-			{
-				LLPipeline::toggleRenderDebugFeatureControl( render_feature );
-			}
-		}
-	}
-
-	void has_render_feature_wrapper(LLSD const& request)
-	{
-		LLEventAPI::Response response(LLSD(), request);
-		U32 render_feature = feature_from_string( request["feature"].asString() );
-		if ( render_feature != 0 )
-		{
-			response["value"] = gPipeline.hasRenderDebugFeatureMask(render_feature);
-		}
-		else
-		{
-			response.error(STRINGIZE("unknown feature '" << request["feature"].asString() << "'"));
-		}
-	}
-
-	void disable_all_render_features_wrapper(LLSD const& request)
-	{
-		gPipeline.clearAllRenderDebugFeatures();
-	}
-
-	void enable_all_render_features_wrapper(LLSD const& request)
-	{
-		gPipeline.setAllRenderDebugFeatures();
-	}
-
-	// Render Info Displays
-	void toggle_info_displays_wrapper(LLSD const& request)
-	{
-		for (LLSD::array_const_iterator iter = request["displays"].beginArray();
-			iter != request["displays"].endArray();
-			++iter)
-		{
-			U64 info_display = info_display_from_string( iter->asString() );
-			if ( info_display != 0 )
-			{
-				LLPipeline::toggleRenderDebug( info_display );
-			}
-		}
-	}
-
-	void has_info_display_wrapper(LLSD const& request)
-	{
-		LLEventAPI::Response response(LLSD(), request);
-		U64 info_display = info_display_from_string( request["display"].asString() );
-		if ( info_display != 0 )
-		{
-			response["value"] = gPipeline.hasRenderDebugMask(info_display);
-		}
-		else
-		{
-			response.error(STRINGIZE("unknown display '" << request["display"].asString() << "'"));
-		}
-	}
-
-	void disable_all_info_displays_wrapper(LLSD const& request)
-	{
-		gPipeline.clearAllRenderDebugDisplays();
-	}
-
-	void enable_all_info_displays_wrapper(LLSD const& request)
-	{
-		gPipeline.setAllRenderDebugDisplays();
-	}
+    // Render Types
+    void toggle_render_types_wrapper(LLSD const& request)
+    {
+        for (LLSD::array_const_iterator iter = request["types"].beginArray();
+            iter != request["types"].endArray();
+            ++iter)
+        {
+            U32 render_type = render_type_from_string( iter->asString() );
+            if ( render_type != 0 )
+            {
+                LLPipeline::toggleRenderTypeControl( render_type );
+            }
+        }
+    }
+
+    void has_render_type_wrapper(LLSD const& request)
+    {
+        LLEventAPI::Response response(LLSD(), request);
+        U32 render_type = render_type_from_string( request["type"].asString() );
+        if ( render_type != 0 )
+        {
+            response["value"] = LLPipeline::hasRenderTypeControl( render_type );
+        }
+        else
+        {
+            response.error(STRINGIZE("unknown type '" << request["type"].asString() << "'"));
+        }
+    }
+
+    void disable_all_render_types_wrapper(LLSD const& request)
+    {
+        gPipeline.clearAllRenderTypes();
+    }
+
+    void enable_all_render_types_wrapper(LLSD const& request)
+    {
+        gPipeline.setAllRenderTypes();
+    }
+
+    // Render Features
+    void toggle_render_features_wrapper(LLSD const& request)
+    {
+        for (LLSD::array_const_iterator iter = request["features"].beginArray();
+            iter != request["features"].endArray();
+            ++iter)
+        {
+            U32 render_feature = feature_from_string( iter->asString() );
+            if ( render_feature != 0 )
+            {
+                LLPipeline::toggleRenderDebugFeatureControl( render_feature );
+            }
+        }
+    }
+
+    void has_render_feature_wrapper(LLSD const& request)
+    {
+        LLEventAPI::Response response(LLSD(), request);
+        U32 render_feature = feature_from_string( request["feature"].asString() );
+        if ( render_feature != 0 )
+        {
+            response["value"] = gPipeline.hasRenderDebugFeatureMask(render_feature);
+        }
+        else
+        {
+            response.error(STRINGIZE("unknown feature '" << request["feature"].asString() << "'"));
+        }
+    }
+
+    void disable_all_render_features_wrapper(LLSD const& request)
+    {
+        gPipeline.clearAllRenderDebugFeatures();
+    }
+
+    void enable_all_render_features_wrapper(LLSD const& request)
+    {
+        gPipeline.setAllRenderDebugFeatures();
+    }
+
+    // Render Info Displays
+    void toggle_info_displays_wrapper(LLSD const& request)
+    {
+        for (LLSD::array_const_iterator iter = request["displays"].beginArray();
+            iter != request["displays"].endArray();
+            ++iter)
+        {
+            U64 info_display = info_display_from_string( iter->asString() );
+            if ( info_display != 0 )
+            {
+                LLPipeline::toggleRenderDebug( info_display );
+            }
+        }
+    }
+
+    void has_info_display_wrapper(LLSD const& request)
+    {
+        LLEventAPI::Response response(LLSD(), request);
+        U64 info_display = info_display_from_string( request["display"].asString() );
+        if ( info_display != 0 )
+        {
+            response["value"] = gPipeline.hasRenderDebugMask(info_display);
+        }
+        else
+        {
+            response.error(STRINGIZE("unknown display '" << request["display"].asString() << "'"));
+        }
+    }
+
+    void disable_all_info_displays_wrapper(LLSD const& request)
+    {
+        gPipeline.clearAllRenderDebugDisplays();
+    }
+
+    void enable_all_info_displays_wrapper(LLSD const& request)
+    {
+        gPipeline.setAllRenderDebugDisplays();
+    }
 
 }
 
 
 LLPipelineListener::LLPipelineListener():
-	LLEventAPI("LLPipeline",
-			   "API to te rendering pipeline.")
+    LLEventAPI("LLPipeline",
+               "API to te rendering pipeline.")
 {
-	// Render Types
-	add("toggleRenderTypes",
-		"Toggle rendering [\"types\"]:\n"
-		"See: llviewermenu.cpp:render_type_from_string for list of available types.",
-		&toggle_render_types_wrapper);
-	add("hasRenderType",
-		"Check if rendering [\"type\"] is enabled:\n"
-		"See: llviewermenu.cpp:render_type_from_string for list of available types.",
-		&has_render_type_wrapper,
-		LLSDMap("reply", LLSD()));
-	add("disableAllRenderTypes",
-		"Turn off all rendering types.",
-		&disable_all_render_types_wrapper);
-	add("enableAllRenderTypes",
-		"Turn on all rendering types.",
-		&enable_all_render_types_wrapper);
-
-	// Render Features
-	add("toggleRenderFeatures",
-		"Toggle rendering [\"features\"]:\n"
-		"See: llviewermenu.cpp:feature_from_string for list of available features.",
-		&toggle_render_features_wrapper);
-	add("hasRenderFeature",
-		"Check if rendering [\"feature\"] is enabled:\n"
-		"See: llviewermenu.cpp:render_feature_from_string for list of available features.",
-		&has_render_feature_wrapper,
-		LLSDMap("reply", LLSD()));
-	add("disableAllRenderFeatures",
-		"Turn off all rendering features.",
-		&disable_all_render_features_wrapper);
-	add("enableAllRenderFeatures",
-		"Turn on all rendering features.",
-		&enable_all_render_features_wrapper);
-
-	// Render Info Displays
-	add("toggleRenderInfoDisplays",
-		"Toggle info [\"displays\"]:\n"
-		"See: llviewermenu.cpp:info_display_from_string for list of available displays.",
-		&toggle_info_displays_wrapper);
-	add("hasRenderInfoDisplay",
-		"Check if info [\"display\"] is enabled:\n"
-		"See: llviewermenu.cpp:info_display_from_string for list of available displays.",
-		&has_info_display_wrapper,
-		LLSDMap("reply", LLSD()));
-	add("disableAllRenderInfoDisplays",
-		"Turn off all info displays.",
-		&disable_all_info_displays_wrapper);
-	add("enableAllRenderInfoDisplays",
-		"Turn on all info displays.",
-		&enable_all_info_displays_wrapper);
+    // Render Types
+    add("toggleRenderTypes",
+        "Toggle rendering [\"types\"]:\n"
+        "See: llviewermenu.cpp:render_type_from_string for list of available types.",
+        &toggle_render_types_wrapper);
+    add("hasRenderType",
+        "Check if rendering [\"type\"] is enabled:\n"
+        "See: llviewermenu.cpp:render_type_from_string for list of available types.",
+        &has_render_type_wrapper,
+        LLSDMap("reply", LLSD()));
+    add("disableAllRenderTypes",
+        "Turn off all rendering types.",
+        &disable_all_render_types_wrapper);
+    add("enableAllRenderTypes",
+        "Turn on all rendering types.",
+        &enable_all_render_types_wrapper);
+
+    // Render Features
+    add("toggleRenderFeatures",
+        "Toggle rendering [\"features\"]:\n"
+        "See: llviewermenu.cpp:feature_from_string for list of available features.",
+        &toggle_render_features_wrapper);
+    add("hasRenderFeature",
+        "Check if rendering [\"feature\"] is enabled:\n"
+        "See: llviewermenu.cpp:render_feature_from_string for list of available features.",
+        &has_render_feature_wrapper,
+        LLSDMap("reply", LLSD()));
+    add("disableAllRenderFeatures",
+        "Turn off all rendering features.",
+        &disable_all_render_features_wrapper);
+    add("enableAllRenderFeatures",
+        "Turn on all rendering features.",
+        &enable_all_render_features_wrapper);
+
+    // Render Info Displays
+    add("toggleRenderInfoDisplays",
+        "Toggle info [\"displays\"]:\n"
+        "See: llviewermenu.cpp:info_display_from_string for list of available displays.",
+        &toggle_info_displays_wrapper);
+    add("hasRenderInfoDisplay",
+        "Check if info [\"display\"] is enabled:\n"
+        "See: llviewermenu.cpp:info_display_from_string for list of available displays.",
+        &has_info_display_wrapper,
+        LLSDMap("reply", LLSD()));
+    add("disableAllRenderInfoDisplays",
+        "Turn off all info displays.",
+        &disable_all_info_displays_wrapper);
+    add("enableAllRenderInfoDisplays",
+        "Turn on all info displays.",
+        &enable_all_info_displays_wrapper);
 }