Merge branch 'main' into marchcat/x-b-merge

# Conflicts:
#	autobuild.xml
#	indra/cmake/ConfigurePkgConfig.cmake
#	indra/cmake/ICU4C.cmake
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
#	indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/lloutfitslist.cpp

1 files changed, 26 insertions, 26 deletions

diff --git a/indra/llwindow/llwindowmesaheadless.cpp b/indra/llwindow/llwindowmesaheadless.cpp
index 4b01f7a979..58f8f80d2d 100644
--- a/indra/llwindow/llwindowmesaheadless.cpp
+++ b/indra/llwindow/llwindowmesaheadless.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llwindowmesaheadless.cpp
  * @brief Platform-dependent implementation of llwindow
  *
  * $LicenseInfo:firstyear=2001&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$
  */
@@ -40,39 +40,39 @@ U16 *gMesaBuffer = NULL;
 //
 LLWindowMesaHeadless::LLWindowMesaHeadless(LLWindowCallbacks* callbacks,
                                            const std::string& title, const std::string& name, S32 x, S32 y, S32 width, S32 height,
-							 U32 flags,  BOOL fullscreen, BOOL clearBg,
-							 BOOL disable_vsync, BOOL use_gl, BOOL ignore_pixel_depth)
-	: LLWindow(callbacks, fullscreen, flags)
+                             U32 flags,  BOOL fullscreen, BOOL clearBg,
+                             BOOL disable_vsync, BOOL use_gl, BOOL ignore_pixel_depth)
+    : LLWindow(callbacks, fullscreen, flags)
 {
-	if (use_gl)
-	{
-		LL_INFOS() << "MESA Init" << LL_ENDL;
-		mMesaContext = OSMesaCreateContextExt( GL_RGBA, 32, 0, 0, NULL );
+    if (use_gl)
+    {
+        LL_INFOS() << "MESA Init" << LL_ENDL;
+        mMesaContext = OSMesaCreateContextExt( GL_RGBA, 32, 0, 0, NULL );
 
-		/* Allocate the image buffer */
-		mMesaBuffer = new unsigned char [width * height * 4 * MESA_CHANNEL_SIZE];
-		llassert(mMesaBuffer);
+        /* Allocate the image buffer */
+        mMesaBuffer = new unsigned char [width * height * 4 * MESA_CHANNEL_SIZE];
+        llassert(mMesaBuffer);
 
-		gMesaBuffer = (U16*)mMesaBuffer;
+        gMesaBuffer = (U16*)mMesaBuffer;
 
-		/* Bind the buffer to the context and make it current */
-		if (!OSMesaMakeCurrent( mMesaContext, mMesaBuffer, MESA_CHANNEL_TYPE, width, height ))
-		{
-			LL_ERRS() << "MESA: OSMesaMakeCurrent failed!" << LL_ENDL;
-		}
+        /* Bind the buffer to the context and make it current */
+        if (!OSMesaMakeCurrent( mMesaContext, mMesaBuffer, MESA_CHANNEL_TYPE, width, height ))
+        {
+            LL_ERRS() << "MESA: OSMesaMakeCurrent failed!" << LL_ENDL;
+        }
 
-		llverify(gGLManager.initGL());
-	}
+        llverify(gGLManager.initGL());
+    }
 }
 
 
 LLWindowMesaHeadless::~LLWindowMesaHeadless()
 {
-	delete mMesaBuffer;
-	OSMesaDestroyContext( mMesaContext );
+    delete mMesaBuffer;
+    OSMesaDestroyContext( mMesaContext );
 }
 
 void LLWindowMesaHeadless::swapBuffers()
 {
-	glFinish();
+    glFinish();
 }