Merge branch 'main' into 26.4

3 files changed, 11 insertions, 13 deletions

diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index af3e23a003..59ec69dbcb 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -29,8 +29,6 @@ elseif (WINDOWS)
     message(WARNING "Could not detect Boost suffix via glob; using fallback '${sfx}'. "
                     "Check that vcpkg installed boost into ${prefix_result}.")
   endif ()
-elseif (NOT (${LINUX_DISTRO} MATCHES freedesktop))
-  find_package( Boost )
 endif ()
 if (NOT (${LINUX_DISTRO} MATCHES freedesktop))
   target_link_libraries( ll::boost INTERFACE
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index c61902cf83..8a73a68c54 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -951,14 +951,14 @@ void LLVertexBuffer::initClass(LLWindow* window)
 {
     llassert(sVBOPool == nullptr);
 
-#if LL_DARWIN || LL_ARM64
+//#if LL_DARWIN || LL_ARM64
     if (gGLManager.mIsApple)
     {
         LL_INFOS() << "VBO Pooling Disabled" << LL_ENDL;
         sVBOPool = new LLAppleVBOPool();
     }
     else
-#endif
+//#endif
     {
         LL_INFOS() << "VBO Pooling Enabled" << LL_ENDL;
         sVBOPool = new LLDefaultVBOPool();
@@ -1296,12 +1296,12 @@ U8* LLVertexBuffer::mapVertexBuffer(LLVertexBuffer::AttributeType type, U32 inde
         count = mNumVerts - index;
     }
 
-#if LL_DARWIN || LL_ARM64
+//#if LL_DARWIN || LL_ARM64
     // Region tracking not needed on apple silicon - it recreates entire buffer
     // While mIsApple can be encountered under windows, this is a
     // macOS OpenGL behavior workaround. LL_ARM64 check might be not needed
     if (!gGLManager.mIsApple)
-#endif
+//#endif
     {
         U32 start = mOffsets[type] + sTypeSize[type] * index;
         U32 end = start + sTypeSize[type] * count-1;
@@ -1338,9 +1338,9 @@ U8* LLVertexBuffer::mapIndexBuffer(U32 index, S32 count)
         count = mNumIndices-index;
     }
 
-#if LL_DARWIN || LL_ARM64
+//#if LL_DARWIN || LL_ARM64
     if (!gGLManager.mIsApple)
-#endif
+//#endif
     {
         U32 start = sizeof(U16) * index;
         U32 end = start + sizeof(U16) * count-1;
@@ -1375,7 +1375,7 @@ U8* LLVertexBuffer::mapIndexBuffer(U32 index, S32 count)
 //  dst -- mMappedData or mMappedIndexData
 void LLVertexBuffer::flush_vbo(GLenum target, U32 start, U32 end, void* data, U8* dst)
 {
-#if LL_DARWIN || LL_ARM64
+//#if LL_DARWIN || LL_ARM64
     if (gGLManager.mIsApple)
     {
         // on OS X, flush_vbo doesn't actually write to the GL buffer, so be sure to call
@@ -1387,7 +1387,7 @@ void LLVertexBuffer::flush_vbo(GLenum target, U32 start, U32 end, void* data, U8
         memcpy(dst+start, data, end-start+1);
     }
     else
-#endif
+//#endif
     {
         llassert(target == GL_ARRAY_BUFFER ? sGLRenderBuffer == mGLBuffer : sGLRenderIndices == mGLIndices);
 
@@ -1442,7 +1442,7 @@ void LLVertexBuffer::_unmapBuffer()
         }
     };
 
-#if LL_DARWIN || LL_ARM64
+//#if LL_DARWIN || LL_ARM64
     if (gGLManager.mIsApple)
     {
         STOP_GLERROR;
@@ -1489,7 +1489,7 @@ void LLVertexBuffer::_unmapBuffer()
         STOP_GLERROR;
     }
     else
-#endif // LL_DARWIN || LL_ARM64
+//#endif // LL_DARWIN || LL_ARM64
     {
         if (!mMappedVertexRegions.empty())
         {
diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake
index b05d70bfc0..099a7070bc 100644
--- a/indra/newview/ViewerInstall.cmake
+++ b/indra/newview/ViewerInstall.cmake
@@ -242,7 +242,7 @@ if (LINUX)
                 DESTINATION ${_LIB}
                 )
         endif ()
-	if (USE_OPENAL AND (${LINUX_DISTRO} MATCHES freedesktop))
+        if (USE_OPENAL AND (${LINUX_DISTRO} MATCHES freedesktop))
             install(
                 FILES
                   ${ARCH_PREBUILT_DIRS_RELEASE}/libalut.so