diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-10-25 20:03:43 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-10-25 20:03:43 +0800 |
| commit | 7c37297689f9e6e1b6ac77f33243c1274d5d9e82 (patch) | |
| tree | b8672ee0d611dbc4bfe2dbabb2b7e278ce0b830b | |
| parent | ab9976389fe5e4c254d3eb2c39fd2dff083d8d2d (diff) | |
| parent | 73c38642a232e61036e0ec234cbcf50abc27927c (diff) | |
Merge branch 'main' into 2025.08
| -rw-r--r-- | indra/newview/FixBundle.cmake.in | 6 | ||||
| -rw-r--r-- | indra/newview/FixPackage.cmake.in | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_about.xml | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in index bf04306c33..3a634faa22 100644 --- a/indra/newview/FixBundle.cmake.in +++ b/indra/newview/FixBundle.cmake.in @@ -241,9 +241,9 @@ execute_process( COMMAND lipo libopenal.1.24.2.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libopenal.1.24.2.dylib - COMMAND lipo libopenjp2.2.5.3.dylib + COMMAND lipo libopenjp2.2.5.4.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libopenjp2.2.5.3.dylib + -output libopenjp2.2.5.4.dylib COMMAND lipo libpng16.16.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libpng16.16.dylib @@ -312,7 +312,7 @@ execute_process( Frameworks/libnghttp2.14.dylib Frameworks/libogg.0.dylib Frameworks/libopenal.1.24.2.dylib - Frameworks/libopenjp2.2.5.3.dylib + Frameworks/libopenjp2.2.5.4.dylib Frameworks/libpng16.16.dylib Frameworks/libvlc.5.dylib Frameworks/libvlccore.9.dylib diff --git a/indra/newview/FixPackage.cmake.in b/indra/newview/FixPackage.cmake.in index b1513be9e0..c7f7b82d80 100644 --- a/indra/newview/FixPackage.cmake.in +++ b/indra/newview/FixPackage.cmake.in @@ -241,9 +241,9 @@ execute_process( COMMAND lipo libopenal.1.24.2.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libopenal.1.24.2.dylib - COMMAND lipo libopenjp2.2.5.3.dylib + COMMAND lipo libopenjp2.2.5.4.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libopenjp2.2.5.3.dylib + -output libopenjp2.2.5.4.dylib COMMAND lipo libpng16.16.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libpng16.16.dylib @@ -312,7 +312,7 @@ execute_process( Frameworks/libnghttp2.14.dylib Frameworks/libogg.0.dylib Frameworks/libopenal.1.24.2.dylib - Frameworks/libopenjp2.2.5.3.dylib + Frameworks/libopenjp2.2.5.4.dylib Frameworks/libpng16.16.dylib Frameworks/libvlc.5.dylib Frameworks/libvlccore.9.dylib diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 80774c329d..3311e0fc0f 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -103,8 +103,8 @@ gwigz (nya) EmilyAmiee Bavid Dailey Aria (Tashia Redrose) Cate (32a) Hiroo Ono Melodey Keysin (scoutkeysin) -Yikes Lopez Padoria Teuden -~ ( ^-^ ) ~ (cutie_qu) Markus Teuden +Padoria Teuden ~ ( ^-^ ) ~ (cutie_qu) +Markus Teuden </text_editor> <text follows="top|left" |