Merge branch 'main' into 26.3

3 files changed, 19 insertions, 20 deletions

diff --git a/indra/cmake/CEFPlugin.cmake b/indra/cmake/CEFPlugin.cmake
index 489caa5d52..269afcc456 100644
--- a/indra/cmake/CEFPlugin.cmake
+++ b/indra/cmake/CEFPlugin.cmake
@@ -29,26 +29,26 @@ if (${LINUX_DISTRO} MATCHES arch AND (CMAKE_SYSTEM_PROCESSOR MATCHES x86_64))
                 DESTINATION ${ARCH_PREBUILT_DIRS_RELEASE}
             )
         endif ()
-        if (NOT EXISTS ${CMAKE_BINARY_DIR}/dullahan-1.40.0-CEF_150.0.16.embed_scheme.tar.gz)
+        if (NOT EXISTS ${CMAKE_BINARY_DIR}/dullahan-1.40.0-CEF_150.0.19.embed_scheme.tar.gz)
             file(DOWNLOAD
-                https://github.com/secondlife/dullahan/archive/refs/tags/v1.40.0-CEF_150.0.16.embed_scheme.tar.gz
-                ${CMAKE_BINARY_DIR}/dullahan-1.40.0-CEF_150.0.16.embed_scheme.tar.gz
+                https://github.com/secondlife/dullahan/archive/refs/tags/v1.40.0-CEF_150.0.19.embed_scheme.tar.gz
+                ${CMAKE_BINARY_DIR}/dullahan-1.40.0-CEF_150.0.19.embed_scheme.tar.gz
             )
         endif ()
         file(ARCHIVE_EXTRACT
-            INPUT ${CMAKE_BINARY_DIR}/dullahan-1.40.0-CEF_150.0.16.embed_scheme.tar.gz
+            INPUT ${CMAKE_BINARY_DIR}/dullahan-1.40.0-CEF_150.0.19.embed_scheme.tar.gz
             DESTINATION ${CMAKE_BINARY_DIR}
         )
         try_compile(DULLAHAN_RESULT
             PROJECT dullahan
-            SOURCE_DIR ${CMAKE_BINARY_DIR}/dullahan-1.40.0-CEF_150.0.16.embed_scheme
-            BINARY_DIR ${CMAKE_BINARY_DIR}/dullahan-1.40.0-CEF_150.0.16.embed_scheme
+            SOURCE_DIR ${CMAKE_BINARY_DIR}/dullahan-1.40.0-CEF_150.0.19.embed_scheme
+            BINARY_DIR ${CMAKE_BINARY_DIR}/dullahan-1.40.0-CEF_150.0.19.embed_scheme
             CMAKE_FLAGS
                 -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
                 -DCMAKE_INSTALL_PREFIX:PATH=${LIBS_PREBUILT_DIR}
                 -DCMAKE_INSTALL_LIBDIR:PATH=${ARCH_PREBUILT_DIRS_RELEASE}
                 -DCEF_WRAPPER_DIR:PATH=/usr/include/cef
-                -DCEF_WRAPPER_BUILD_DIR:PATH=${CMAKE_BINARY_DIR}/dullahan-1.40.0-CEF_150.0.16.embed_scheme
+                -DCEF_WRAPPER_BUILD_DIR:PATH=${CMAKE_BINARY_DIR}/dullahan-1.40.0-CEF_150.0.19.embed_scheme
                 -DCEF_LIBRARY_RELEASE:FILEPATH=${INSTALL_PREFIX}/lib/cef/libcef.so
                 -DCEF_DLL_LIBRARY_RELEASE:FILEPATH=${ARCH_PREBUILT_DIRS_RELEASE}/libcef_dll_wrapper.a
                 "-DCMAKE_CXX_FLAGS:STRING=-I/usr/include/cef -I/usr/src/cef -DWRAPPING_CEF_SHARED"
@@ -56,7 +56,7 @@ if (${LINUX_DISTRO} MATCHES arch AND (CMAKE_SYSTEM_PROCESSOR MATCHES x86_64))
         if (${DULLAHAN_RESULT})
             file(MAKE_DIRECTORY ${LIBS_PREBUILT_DIR}/bin/release)
             file(
-                COPY ${CMAKE_BINARY_DIR}/dullahan-1.40.0-CEF_150.0.16.embed_scheme/dullahan_host
+                COPY ${CMAKE_BINARY_DIR}/dullahan-1.40.0-CEF_150.0.19.embed_scheme/dullahan_host
                 DESTINATION ${LIBS_PREBUILT_DIR}/bin/release
             )
             if (CMAKE_BUILD_TYPE MATCHES Release)
@@ -66,14 +66,14 @@ if (${LINUX_DISTRO} MATCHES arch AND (CMAKE_SYSTEM_PROCESSOR MATCHES x86_64))
                 )
             endif ()
             file(
-                COPY ${CMAKE_BINARY_DIR}/dullahan-1.40.0-CEF_150.0.16.embed_scheme/libdullahan.a
+                COPY ${CMAKE_BINARY_DIR}/dullahan-1.40.0-CEF_150.0.19.embed_scheme/libdullahan.a
                 DESTINATION ${ARCH_PREBUILT_DIRS_RELEASE}
             )
             file(MAKE_DIRECTORY ${LIBS_PREBUILT_DIR}/include/cef)
             file(
                 COPY
-                    ${CMAKE_BINARY_DIR}/dullahan-1.40.0-CEF_150.0.16.embed_scheme/src/dullahan.h
-                    ${CMAKE_BINARY_DIR}/dullahan-1.40.0-CEF_150.0.16.embed_scheme/src/dullahan_version.h
+                    ${CMAKE_BINARY_DIR}/dullahan-1.40.0-CEF_150.0.19.embed_scheme/src/dullahan.h
+                    ${CMAKE_BINARY_DIR}/dullahan-1.40.0-CEF_150.0.19.embed_scheme/src/dullahan_version.h
                 DESTINATION ${LIBS_PREBUILT_DIR}/include/cef
             )
             file(WRITE ${PREBUILD_TRACKING_DIR}/dullahan_installed "0")
diff --git a/indra/cmake/Discord.cmake b/indra/cmake/Discord.cmake
index 005e548f08..22741c233f 100644
--- a/indra/cmake/Discord.cmake
+++ b/indra/cmake/Discord.cmake
@@ -14,7 +14,7 @@ if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKIN
         set(PREFIX_PATH $ENV{HOME}/Downloads)
     endif ()
     file(ARCHIVE_EXTRACT
-        INPUT ${PREFIX_PATH}/DiscordSocialSdk-1.10.18247.zip
+        INPUT ${PREFIX_PATH}/DiscordSocialSdk-1.10.18369.zip
         DESTINATION ${CMAKE_BINARY_DIR}
         )
     file(MAKE_DIRECTORY ${LIBS_PREBUILT_DIR}/include/discord_sdk)
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 9c932ac034..bfe1477fa0 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -87,7 +87,7 @@ Megapahit is brought to you by:
        enabled="false"
        font="Monospace"
        follows="top|left"
-       height="200"
+       height="180"
        bg_readonly_color="Transparent"
        left="5"
        text_color="LtGray"
@@ -99,12 +99,10 @@ Erik Kundiman                 LinneNoir
 milo (observeur)              Fritigern Gothly
 Kou Ayashi                    Hadet Sonnenkern
 Remmy (Secret Foxtail)        Eris Ravenwood
-gwigz (nya)                   EmilyAmiee
-Bavid Dailey                  Aria (Tashia Redrose)
-Cate (32a)                    Hiroo Ono
-Melodey                       Keysin (scoutkeysin)
-Padoria Teuden                ~ ( ^-^ ) ~ (cutie_qu)
-Markus Teuden
+EmilyAmiee                    Bavid Dailey
+Aria (Tashia Redrose)         Cate (32a)
+Hiroo Ono                     Melodey
+Keysin                        ~ ( ^-^ ) ~ (cutie_qu)
     </text_editor>
     <text
           follows="top|left"
@@ -120,7 +118,7 @@ with special thanks to:
 <text_editor
        enabled="false"
        follows="top|left"
-       height="130"
+       height="150"
        bg_readonly_color="Transparent"
        left="5"
        text_color="LtGray"
@@ -135,6 +133,7 @@ Vir Linden - Making it possible for the project to have a place in SL
 nutsobvious - Early testing and video proof
 Soft Linden - Security testing
 Kyle Linden - Giving TPV parcel 2 to Erik Kundiman
+gwigz (nya) - Feature contributions
 Signal Linden - Opening opportunities for Megapahit to contribute more
     </text_editor>
     </panel>