diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-11-27 12:49:49 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-11-27 12:49:49 +0800 |
| commit | b815cb96d3f52ff66945ee20c5cb7d135d353300 (patch) | |
| tree | e456d8fcaf3a0c3539a92170d43217d4391f5423 | |
| parent | c7c13c0a1ea6bc51c02cc5fda5b5975af53ede6f (diff) | |
| parent | 999783f3344729e4ccbd46846118eef964537a75 (diff) | |
Merge branch 'main' into 2024.09-ExtraFPS
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_about.xml | 9 |
2 files changed, 7 insertions, 6 deletions
@@ -71,12 +71,12 @@ $ megapahit ### Fedora ``` -$ sudo dnf install cmake gcc-c++ patchelf apr-util-devel boost-devel boost-url expat-devel fltk-devel mesa-libGLU-devel hunspell-devel minizip-ng-compat-devel libnghttp2-devel nanosvg-devel pipewire-devel pulseaudio-libs-devel SDL2-devel uriparser-devel vlc-devel libvorbis-devel xxhash-devel +$ sudo dnf install cmake gcc-c++ patch patchelf rpm-build apr-util-devel boost-devel boost-url expat-devel fltk-devel mesa-libGLU-devel hunspell-devel minizip-ng-compat-devel libnghttp2-devel nanosvg-devel pipewire-devel pulseaudio-libs-devel SDL2-devel uriparser-devel vlc-devel libvorbis-devel libXcursor-devel libXfixes-devel libXinerama-devel xxhash-devel $ export LL_BUILD="-O3 -std=c++17 -fPIC -DLL_LINUX=1" $ cmake -DCMAKE_BUILD_TYPE:STRING=Release -DADDRESS_SIZE:STRING=64 -DUSESYSTEMLIBS:BOOL=ON -DUSE_OPENAL:BOOL=OFF -DUSE_FMODSTUDIO:BOOL=ON -DENABLE_MEDIA_PLUGINS:BOOL=ON -DLL_TESTS:BOOL=OFF -DNDOF:BOOL=ON -DROOT_PROJECT_NAME:STRING=Megapahit -DVIEWER_CHANNEL:STRING=Megapahit -DVIEWER_BINARY_NAME:STRING=megapahit -DBUILD_SHARED_LIBS:BOOL=OFF -DINSTALL:BOOL=ON -DPACKAGE:BOOL=ON ../indra $ make -j`nproc` $ cpack -G RPM -$ sudo rpm -i megapahit-`cat newview/viewer_version.txt`-Linux.rpm +$ sudo dnf install megapahit-`cat newview/viewer_version.txt`-Linux.rpm $ megapahit ``` diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index ec2d1471cc..6f5a6d141b 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -70,7 +70,7 @@ follows="all" left="10" name="megapahit_credits_panel" - height="390" + height="405" top="10"> <text follows="top|left|right" @@ -86,7 +86,7 @@ Megapahit is brought to you by (in order of appearance): <text_editor enabled="false" follows="top|left" - height="230" + height="245" bg_readonly_color="Transparent" left="5" text_color="LtGray" @@ -98,17 +98,18 @@ 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) -Melodey Hiroo Ono +Melodey Keysin (scoutkeysin) -gwigz Yikes Lopez </text_editor> <text |