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

diff --git a/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp b/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
index 2e4baaa9eb..dcc04b37e4 100644
--- a/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
+++ b/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llmediaimplgstreamer_syms.cpp
  * @brief dynamic GStreamer symbol-grabbing code
  *
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2007&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$
  * @endcond
@@ -48,8 +48,8 @@ extern "C" {
 GstDebugCategory*
 ll_gst_debug_category_new(gchar *name, guint color, gchar *description)
 {
-	static GstDebugCategory dummy;
-	return &dummy;
+    static GstDebugCategory dummy;
+    return &dummy;
 }
 void ll_gst_debug_register_funcptr(GstDebugFuncPtr func, gchar* ptrname)
 {
@@ -62,105 +62,105 @@ static apr_dso_handle_t *sSymGSTDSOHandleV = NULL;
 
 
 bool grab_gst_syms(std::string gst_dso_name,
-		   std::string gst_dso_name_vid)
+           std::string gst_dso_name_vid)
 {
-	if (sSymsGrabbed)
-	{
-		// already have grabbed good syms
-		return TRUE;
-	}
+    if (sSymsGrabbed)
+    {
+        // already have grabbed good syms
+        return TRUE;
+    }
 
-	bool sym_error = false;
-	bool rtn = false;
-	apr_status_t rv;
-	apr_dso_handle_t *sSymGSTDSOHandle = NULL;
+    bool sym_error = false;
+    bool rtn = false;
+    apr_status_t rv;
+    apr_dso_handle_t *sSymGSTDSOHandle = NULL;
 
 #define LL_GST_SYM(REQ, GSTSYM, RTN, ...) do{rv = apr_dso_sym((apr_dso_handle_sym_t*)&ll##GSTSYM, sSymGSTDSOHandle, #GSTSYM); if (rv != APR_SUCCESS) {INFOMSG("Failed to grab symbol: %s", #GSTSYM); if (REQ) sym_error = true;} else DEBUGMSG("grabbed symbol: %s from %p", #GSTSYM, (void*)ll##GSTSYM);}while(0)
 
-	//attempt to load the shared libraries
-	apr_pool_create(&sSymGSTDSOMemoryPool, NULL);
-  
-	if ( APR_SUCCESS == (rv = apr_dso_load(&sSymGSTDSOHandle,
-					       gst_dso_name.c_str(),
-					       sSymGSTDSOMemoryPool) ))
-	{
-		INFOMSG("Found DSO: %s", gst_dso_name.c_str());
+    //attempt to load the shared libraries
+    apr_pool_create(&sSymGSTDSOMemoryPool, NULL);
+
+    if ( APR_SUCCESS == (rv = apr_dso_load(&sSymGSTDSOHandle,
+                           gst_dso_name.c_str(),
+                           sSymGSTDSOMemoryPool) ))
+    {
+        INFOMSG("Found DSO: %s", gst_dso_name.c_str());
 #include "llmediaimplgstreamer_syms_raw.inc"
-      
-		if ( sSymGSTDSOHandle )
-		{
-			sSymGSTDSOHandleG = sSymGSTDSOHandle;
-			sSymGSTDSOHandle = NULL;
-		}
-      
-		if ( APR_SUCCESS ==
-		     (rv = apr_dso_load(&sSymGSTDSOHandle,
-					gst_dso_name_vid.c_str(),
-					sSymGSTDSOMemoryPool) ))
-		{
-			INFOMSG("Found DSO: %s", gst_dso_name_vid.c_str());
+
+        if ( sSymGSTDSOHandle )
+        {
+            sSymGSTDSOHandleG = sSymGSTDSOHandle;
+            sSymGSTDSOHandle = NULL;
+        }
+
+        if ( APR_SUCCESS ==
+             (rv = apr_dso_load(&sSymGSTDSOHandle,
+                    gst_dso_name_vid.c_str(),
+                    sSymGSTDSOMemoryPool) ))
+        {
+            INFOMSG("Found DSO: %s", gst_dso_name_vid.c_str());
 #include "llmediaimplgstreamer_syms_rawv.inc"
-			rtn = !sym_error;
-		}
-		else
-		{
-			INFOMSG("Couldn't load DSO: %s", gst_dso_name_vid.c_str());
-			rtn = false; // failure
-		}
-	}
-	else
-	{
-		INFOMSG("Couldn't load DSO: %s", gst_dso_name.c_str());
-		rtn = false; // failure
-	}
-
-	if (sym_error)
-	{
-		WARNMSG("Failed to find necessary symbols in GStreamer libraries.");
-	}
-	
-	if ( sSymGSTDSOHandle )
-	{
-		sSymGSTDSOHandleV = sSymGSTDSOHandle;
-		sSymGSTDSOHandle = NULL;
-	}
+            rtn = !sym_error;
+        }
+        else
+        {
+            INFOMSG("Couldn't load DSO: %s", gst_dso_name_vid.c_str());
+            rtn = false; // failure
+        }
+    }
+    else
+    {
+        INFOMSG("Couldn't load DSO: %s", gst_dso_name.c_str());
+        rtn = false; // failure
+    }
+
+    if (sym_error)
+    {
+        WARNMSG("Failed to find necessary symbols in GStreamer libraries.");
+    }
+
+    if ( sSymGSTDSOHandle )
+    {
+        sSymGSTDSOHandleV = sSymGSTDSOHandle;
+        sSymGSTDSOHandle = NULL;
+    }
 #undef LL_GST_SYM
 
-	sSymsGrabbed = !!rtn;
-	return rtn;
+    sSymsGrabbed = !!rtn;
+    return rtn;
 }
 
 
 void ungrab_gst_syms()
-{ 
-	// should be safe to call regardless of whether we've
-	// actually grabbed syms.
-
-	if ( sSymGSTDSOHandleG )
-	{
-		apr_dso_unload(sSymGSTDSOHandleG);
-		sSymGSTDSOHandleG = NULL;
-	}
-	
-	if ( sSymGSTDSOHandleV )
-	{
-		apr_dso_unload(sSymGSTDSOHandleV);
-		sSymGSTDSOHandleV = NULL;
-	}
-	
-	if ( sSymGSTDSOMemoryPool )
-	{
-		apr_pool_destroy(sSymGSTDSOMemoryPool);
-		sSymGSTDSOMemoryPool = NULL;
-	}
-	
-	// NULL-out all of the symbols we'd grabbed
+{
+    // should be safe to call regardless of whether we've
+    // actually grabbed syms.
+
+    if ( sSymGSTDSOHandleG )
+    {
+        apr_dso_unload(sSymGSTDSOHandleG);
+        sSymGSTDSOHandleG = NULL;
+    }
+
+    if ( sSymGSTDSOHandleV )
+    {
+        apr_dso_unload(sSymGSTDSOHandleV);
+        sSymGSTDSOHandleV = NULL;
+    }
+
+    if ( sSymGSTDSOMemoryPool )
+    {
+        apr_pool_destroy(sSymGSTDSOMemoryPool);
+        sSymGSTDSOMemoryPool = NULL;
+    }
+
+    // NULL-out all of the symbols we'd grabbed
 #define LL_GST_SYM(REQ, GSTSYM, RTN, ...) do{ll##GSTSYM = NULL;}while(0)
 #include "llmediaimplgstreamer_syms_raw.inc"
 #include "llmediaimplgstreamer_syms_rawv.inc"
 #undef LL_GST_SYM
 
-	sSymsGrabbed = false;
+    sSymsGrabbed = false;
 }