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

diff --git a/indra/llwindow/llwindowmesaheadless.cpp b/indra/llwindow/llwindowmesaheadless.cpp
index 4b28587048..a0dd2bc086 100644
--- a/indra/llwindow/llwindowmesaheadless.cpp
+++ b/indra/llwindow/llwindowmesaheadless.cpp
@@ -1,78 +1,78 @@
-/** 
- * @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$
- */
-
-#include "linden_common.h"
-#include "indra_constants.h"
-
-#include "llwindowmesaheadless.h"
-#include "llgl.h"
-
-#define MESA_CHANNEL_TYPE GL_UNSIGNED_SHORT
-#define MESA_CHANNEL_SIZE 2
-
-U16 *gMesaBuffer = NULL;
-
-//
-// LLWindowMesaHeadless
-//
-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)
-{
-	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);
-
-		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;
-		}
-
-		llverify(gGLManager.initGL());
-	}
-}
-
-
-LLWindowMesaHeadless::~LLWindowMesaHeadless()
-{
-	delete mMesaBuffer;
-	OSMesaDestroyContext( mMesaContext );
-}
-
-void LLWindowMesaHeadless::swapBuffers()
-{
-	glFinish();
-}
+/**

+ * @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$

+ */

+

+#include "linden_common.h"

+#include "indra_constants.h"

+

+#include "llwindowmesaheadless.h"

+#include "llgl.h"

+

+#define MESA_CHANNEL_TYPE GL_UNSIGNED_SHORT

+#define MESA_CHANNEL_SIZE 2

+

+U16 *gMesaBuffer = NULL;

+

+//

+// LLWindowMesaHeadless

+//

+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)

+{

+    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);

+

+        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;

+        }

+

+        llverify(gGLManager.initGL());

+    }

+}

+

+

+LLWindowMesaHeadless::~LLWindowMesaHeadless()

+{

+    delete mMesaBuffer;

+    OSMesaDestroyContext( mMesaContext );

+}

+

+void LLWindowMesaHeadless::swapBuffers()

+{

+    glFinish();

+}