From d58681992cbae12a1f7c5536cef97364fbe67467 Mon Sep 17 00:00:00 2001 From: fowlerdm Date: Wed, 19 Jun 2024 17:55:32 -0600 Subject: ViewerInstall.cmake: Install libfmod on Linux Install libfmod.so, libfmod.so.13, and libfmod.so.13.22 --- indra/newview/ViewerInstall.cmake | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index 7ee70132c0..ba01e7e1b1 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -16,6 +16,9 @@ if (LINUX) endif () install(FILES ${AUTOBUILD_INSTALL_DIR}/lib/release/libcef.so + ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so + ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13 + ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13.22 DESTINATION ${_LIB}) install(PROGRAMS ${AUTOBUILD_INSTALL_DIR}/bin/release/chrome-sandbox -- cgit v1.2.3 From ab8d97fccc285913afd2dfb05cc5c09bde291b79 Mon Sep 17 00:00:00 2001 From: fowlerdm Date: Wed, 19 Jun 2024 17:56:43 -0600 Subject: panel_progress.xml: "Megapahit uses" Display "Megapahit uses" instead of "Second Life uses" above 3p_icons --- indra/newview/skins/default/xui/en/panel_progress.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml index 242b96b695..0742cef7c7 100644 --- a/indra/newview/skins/default/xui/en/panel_progress.xml +++ b/indra/newview/skins/default/xui/en/panel_progress.xml @@ -163,7 +163,7 @@ line_spacing.pixels="2" name="logos_lbl" text_color="LoginProgressBoxTextColor"> - Second Life uses + Megapahit uses -- cgit v1.2.3 From 0ecccc78bbf12fb2ce51d32ab2c7b50be04ed02f Mon Sep 17 00:00:00 2001 From: fowlerdm Date: Wed, 19 Jun 2024 18:18:42 -0600 Subject: Show fmod logo on login Revert 82391adeb81656b6b23559c52bf4a3db2c932673, hide vivox --- indra/newview/llprogressview.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index 2891f21b6a..4d08d19c70 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -429,6 +429,7 @@ void LLProgressView::initLogos() texture_start_x += icon_width + default_pad; #endif //LL_HAVOK +/* // 108x41 icon_width = 74; icon_height = default_height; @@ -438,6 +439,7 @@ void LLProgressView::initLogos() default_clip, default_clip); } +*/ void LLProgressView::initStartTexture(S32 location_id, bool is_in_production) { @@ -517,7 +519,7 @@ void LLProgressView::initStartTexture(S32 location_id, bool is_in_production) void LLProgressView::initTextures(S32 location_id, bool is_in_production) { initStartTexture(location_id, is_in_production); - //initLogos(); + initLogos(); childSetVisible("panel_icons", mLogosList.empty() ? FALSE : TRUE); childSetVisible("panel_top_spacer", mLogosList.empty() ? TRUE : FALSE); -- cgit v1.2.3 From a2f0c9824480b8c4e530be8bc4a1631d0c3bfced Mon Sep 17 00:00:00 2001 From: fowlerdm Date: Wed, 19 Jun 2024 18:35:35 -0600 Subject: llprogressview: comment out unused variable //const S32 default_height = 28; --- indra/newview/llprogressview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index 4d08d19c70..af0e27f7f5 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -381,7 +381,7 @@ void LLProgressView::initLogos() const U8 image_codec = IMG_CODEC_PNG; const LLRectf default_clip(0.f, 1.f, 1.f, 0.f); - const S32 default_height = 28; + //const S32 default_height = 28; const S32 default_pad = 15; S32 icon_width, icon_height; -- cgit v1.2.3 From 82536ba453c60dbadcfea736ed896591b7ad2ef9 Mon Sep 17 00:00:00 2001 From: fowlerdm Date: Wed, 19 Jun 2024 18:56:57 -0600 Subject: llprogressview.cpp: Correct formatting Previous formatting resulted in compilation failure --- indra/newview/llprogressview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index af0e27f7f5..664860db30 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -438,8 +438,8 @@ void LLProgressView::initLogos() LLRect(texture_start_x, texture_start_y + icon_height, texture_start_x + icon_width, texture_start_y), default_clip, default_clip); -} */ +} void LLProgressView::initStartTexture(S32 location_id, bool is_in_production) { -- cgit v1.2.3 From 217c2946d5c7663195351add4c7879bda64e581b Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Tue, 25 Jun 2024 06:44:24 +0800 Subject: Replace tabs in ViewerInstall.cmake with spaces --- indra/newview/ViewerInstall.cmake | 68 +++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index ba01e7e1b1..3ad4cc72f9 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -7,40 +7,40 @@ install(PROGRAMS linux_tools/launch_url.sh ) if (LINUX) - if (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu) - set(_LIB lib/${ARCH}-linux-gnu) - elseif (EXISTS /lib64) - set(_LIB lib64) - else () - set(_LIB lib) - endif () - install(FILES - ${AUTOBUILD_INSTALL_DIR}/lib/release/libcef.so - ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so - ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13 - ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13.22 - DESTINATION ${_LIB}) - install(PROGRAMS - ${AUTOBUILD_INSTALL_DIR}/bin/release/chrome-sandbox - DESTINATION libexec/${VIEWER_BINARY_NAME} - PERMISSIONS SETUID OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - install(PROGRAMS - ${AUTOBUILD_INSTALL_DIR}/bin/release/dullahan_host - DESTINATION libexec/${VIEWER_BINARY_NAME}) - install(FILES - ${AUTOBUILD_INSTALL_DIR}/bin/release/snapshot_blob.bin - ${AUTOBUILD_INSTALL_DIR}/bin/release/v8_context_snapshot.bin - DESTINATION ${_LIB}) - install(FILES - ${AUTOBUILD_INSTALL_DIR}/resources/chrome_100_percent.pak - ${AUTOBUILD_INSTALL_DIR}/resources/chrome_200_percent.pak - ${AUTOBUILD_INSTALL_DIR}/resources/icudtl.dat - ${AUTOBUILD_INSTALL_DIR}/resources/resources.pak - DESTINATION ${_LIB}) - install(DIRECTORY - ${AUTOBUILD_INSTALL_DIR}/resources/locales - DESTINATION ${_LIB}) + if (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu) + set(_LIB lib/${ARCH}-linux-gnu) + elseif (EXISTS /lib64) + set(_LIB lib64) + else () + set(_LIB lib) + endif () + install(FILES + ${AUTOBUILD_INSTALL_DIR}/lib/release/libcef.so + ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so + ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13 + ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13.22 + DESTINATION ${_LIB}) + install(PROGRAMS + ${AUTOBUILD_INSTALL_DIR}/bin/release/chrome-sandbox + DESTINATION libexec/${VIEWER_BINARY_NAME} + PERMISSIONS SETUID OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + install(PROGRAMS + ${AUTOBUILD_INSTALL_DIR}/bin/release/dullahan_host + DESTINATION libexec/${VIEWER_BINARY_NAME}) + install(FILES + ${AUTOBUILD_INSTALL_DIR}/bin/release/snapshot_blob.bin + ${AUTOBUILD_INSTALL_DIR}/bin/release/v8_context_snapshot.bin + DESTINATION ${_LIB}) + install(FILES + ${AUTOBUILD_INSTALL_DIR}/resources/chrome_100_percent.pak + ${AUTOBUILD_INSTALL_DIR}/resources/chrome_200_percent.pak + ${AUTOBUILD_INSTALL_DIR}/resources/icudtl.dat + ${AUTOBUILD_INSTALL_DIR}/resources/resources.pak + DESTINATION ${_LIB}) + install(DIRECTORY + ${AUTOBUILD_INSTALL_DIR}/resources/locales + DESTINATION ${_LIB}) endif (LINUX) install(DIRECTORY skins app_settings fonts -- cgit v1.2.3 From c4314620aa8516cbdeb80e2a54dfa8c393b416dd Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Tue, 25 Jun 2024 13:10:09 +0800 Subject: Add more people to the team --- indra/newview/skins/default/xui/en/floater_about.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 5d51cbd682..43a5bd1132 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -96,7 +96,10 @@ Megapahit is brought to you by (in order of appearance): word_wrap="true"> Erik Kundiman observeur +Fritigern Gothly +Hadet Sonnenkern Secret Foxtail +Eris Ravenwood -- cgit v1.2.3 From 08ec71b8a32ba361008e515c5e9d89d7e3ada1c1 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Tue, 25 Jun 2024 14:50:23 +0800 Subject: Unhide one team member --- indra/newview/skins/default/xui/en/floater_about.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 43a5bd1132..6a97e82d7f 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -86,7 +86,7 @@ Megapahit is brought to you by (in order of appearance): Date: Tue, 25 Jun 2024 05:59:28 -0600 Subject: floater_about.xml: special thanks fix formatting --- indra/newview/skins/default/xui/en/floater_about.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 6a97e82d7f..b5d99d3006 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -128,8 +128,8 @@ LinneNoir for the moral support and initial testing; Vir Linden for making it possible for the project to have a place (in every sense of the word) in SL; nutsobvious for the early testing and video proof; Kokua for the Dullahan fork; -Soft Linden for the security testing; -Kyle Linden for selling TPV parcel 2 to Erik Kundiman at L$0 price; and +Soft Linden for the security testing; and +Kyle Linden for selling TPV parcel 2 to Erik Kundiman at L$0 price. -- cgit v1.2.3 From db05faae7065a1e5bd69fd8798e3becddc69c56a Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Wed, 26 Jun 2024 08:43:00 +0800 Subject: Rename "Second Life" titles when using Cocoa For when not using SDL2 for macOS too. It took me a while to find where to rename these (which might be easier to find if I was on an Xcode project maybe? Not sure). I couldn't open the nib file using Xcode (opening the xib would even require me to have its format updated first). So what I did was, `plutil -convert xml1 -o SecondLife.xib SecondLife.nib` (The output could be some other name, to be honest.) Rename all "Second Life" to "Megapahit" in the generated xib, and then convert it back to binary. `plutil -convert binary1 -o SecondLife.nib SecondLife.xib` I just had to output the generated ASCII one to an existing file, so I just reverted it, no need to track any changes there. `git restore SecondLife.xib` --- indra/newview/SecondLife.nib | Bin 12345 -> 11888 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/SecondLife.nib b/indra/newview/SecondLife.nib index c4ddca50dc..ef0fa80b12 100644 Binary files a/indra/newview/SecondLife.nib and b/indra/newview/SecondLife.nib differ -- cgit v1.2.3 From 85b541bb4b81e35909f32c76c7a3bc672ce36f2b Mon Sep 17 00:00:00 2001 From: fowlerdm Date: Wed, 26 Jun 2024 07:14:29 -0600 Subject: Linden_Dollar_Background.png adjustment Try adding some transparency --- .../textures/widgets/Linden_Dollar_Background.png | Bin 143550 -> 153649 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png b/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png index c01d50e6b9..f80b77aab5 100644 Binary files a/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png and b/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png differ -- cgit v1.2.3 From d9325eb964d07edb773dee23f196452874ea2b62 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Wed, 26 Jun 2024 21:53:40 +0800 Subject: Credits for Kokua team --- indra/newview/skins/default/xui/en/floater_about.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index b5d99d3006..a0e87fd43a 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -115,7 +115,7 @@ with special thanks to (in order of appearance): +Chorazin Allen and Nicky Perian for involving Erik Kundiman in viewer developments; LinneNoir for the moral support and initial testing; Vir Linden for making it possible for the project to have a place (in every sense of the word) in SL; nutsobvious for the early testing and video proof; -- cgit v1.2.3 From 161935f3178f343848839ad93ccaa6c1988bdef6 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Fri, 21 Jun 2024 17:40:58 +0800 Subject: Revert to using Cocoa instead of SDL2 for macOS Our SDL2-based code is kept Darwin-ready. This move was triggered by the merge with SLv's release/maint-b branch causing the viewer to show only a black screen, even though everything else seemed to be working (logging in, streaming, quitting the app). This decision also has caused numerous MPv specific window-related macOS bugs to be fixed. I wanted to commit this on the main branch, but somehow it failed to build. This move was bound to happen at the arrival of Maintenance B after all. --- indra/newview/CMakeLists.txt | 12 ++++++------ indra/newview/llappviewer.cpp | 8 ++++++++ 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 352dd4a5ee..2ea0ef19d3 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1421,15 +1421,15 @@ set_source_files_properties( ) if (DARWIN) - if (NOT USESYSTEMLIBS) +# if (NOT USESYSTEMLIBS) LIST(APPEND viewer_SOURCE_FILES llappviewermacosx.cpp) LIST(APPEND viewer_SOURCE_FILES llappviewermacosx-objc.mm) LIST(APPEND viewer_SOURCE_FILES llappviewermacosx-objc.h) - endif (NOT USESYSTEMLIBS) +# endif (NOT USESYSTEMLIBS) LIST(APPEND viewer_SOURCE_FILES llfilepicker_mac.mm) LIST(APPEND viewer_HEADER_FILES llfilepicker_mac.h) - if (NOT USESYSTEMLIBS) +# if (NOT USESYSTEMLIBS) # This should be compiled with the viewer. LIST(APPEND viewer_SOURCE_FILES llappdelegate-objc.mm) set_source_files_properties( @@ -1444,7 +1444,7 @@ if (DARWIN) # warnings. COMPILE_FLAGS "-fmodules -fcxx-modules -Wno-nullability-completeness" ) - endif (NOT USESYSTEMLIBS) +# endif (NOT USESYSTEMLIBS) # Add resource files to the project. set(viewer_RESOURCE_FILES @@ -1464,7 +1464,7 @@ if (DARWIN) list(APPEND viewer_SOURCE_FILES ${viewer_RESOURCE_FILES}) endif (DARWIN) -if (USESYSTEMLIBS) +if (USESYSTEMLIBS AND NOT DARWIN) LIST(APPEND viewer_SOURCE_FILES llappviewerlinux.cpp) set_source_files_properties( llappviewerlinux.cpp @@ -1476,7 +1476,7 @@ if (USESYSTEMLIBS) SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed") endif () -endif (USESYSTEMLIBS) +endif (USESYSTEMLIBS AND NOT DARWIN) if (WINDOWS) list(APPEND viewer_SOURCE_FILES diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 326ffa917a..601caddc7f 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -138,7 +138,11 @@ #include "vlc/libvlc_version.h" #if LL_DARWIN +#if LL_SDL #include "llwindowsdl.h" +#else +#include "llwindowmacosx.h" +#endif // LL_SDL #endif // Third party library includes @@ -567,7 +571,11 @@ static void settings_to_globals() LLWorldMapView::setScaleSetting(gSavedSettings.getF32("MapScale")); #if LL_DARWIN +#if LL_SDL LLWindowSDL::sUseMultGL = gSavedSettings.getBOOL("RenderAppleUseMultGL"); +#else + LLWindowMacOSX::sUseMultGL = gSavedSettings.getBOOL("RenderAppleUseMultGL"); +#endif // LL_SDL gHiDPISupport = gSavedSettings.getBOOL("RenderHiDPI"); #endif } -- cgit v1.2.3 From 0da58c31bedf29f2fcf898349e96828bd8e7517b Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Tue, 25 Jun 2024 10:11:21 +0800 Subject: FontConfig's not used any more on macOS Since we stopped using SDL2 on it. It was added here before, I remember it was so it would build on macOS too. --- indra/newview/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 2ea0ef19d3..8070cd0796 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1961,7 +1961,6 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${LLPHYSICSEXTENSIONS_LIBRARIES} ll::bugsplat ll::tracy - ll::fontconfig ) if (ENABLE_MEDIA_PLUGINS) -- cgit v1.2.3 From 9890ebc0978e0ec3567fb78dba4bd2d4a18855f3 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Tue, 25 Jun 2024 09:23:48 +0800 Subject: Disable SLVersionChecker (for all platforms) We haven't implemented our version checking anyway. --- indra/newview/llappviewer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 601caddc7f..2d65c725b5 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1141,7 +1141,7 @@ bool LLAppViewer::init() gGLActive = FALSE; -#if LL_RELEASE_FOR_DOWNLOAD +#if 0 // LL_RELEASE_FOR_DOWNLOAD // Skip updater if this is a non-interactive instance if (!gSavedSettings.getBOOL("CmdLineSkipUpdater") && !gNonInteractive) { -- cgit v1.2.3 From 1852ebd65df1748f071947204e440f1dece30f31 Mon Sep 17 00:00:00 2001 From: mobserveur Date: Fri, 28 Jun 2024 11:23:08 +0200 Subject: Apple GPU Optimisations This commit massively improves 2D UI, 3D UI and 3D world rendering performance and smoothness. --- indra/newview/lltracker.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp index 1bc49490d2..a62116e913 100644 --- a/indra/newview/lltracker.cpp +++ b/indra/newview/lltracker.cpp @@ -493,7 +493,7 @@ void draw_shockwave(F32 center_z, F32 t, S32 steps, LLColor4 color) void LLTracker::drawBeacon(LLVector3 pos_agent, std::string direction, LLColor4 fogged_color, F32 dist) { const F32 MAX_HEIGHT = 5020.f; - const U32 BEACON_ROWS = 256; + const U32 BEACON_ROWS = 128; U32 nRows; F32 height; @@ -517,11 +517,10 @@ void LLTracker::drawBeacon(LLVector3 pos_agent, std::string direction, LLColor4 } nRows = ceil((BEACON_ROWS * height) / MAX_HEIGHT); + if(nRows<2) nRows=2; rowHeight = height / nRows; - gGL.color4fv(fogged_color.mV); - LLVector3 x_axis = LLViewerCamera::getInstance()->getLeftAxis(); F32 t = gRenderStartTime.getElapsedTimeF32(); @@ -536,6 +535,8 @@ void LLTracker::drawBeacon(LLVector3 pos_agent, std::string direction, LLColor4 bool tracking_avatar = getTrackingStatus() == TRACKING_AVATAR; + gGL.color4fv(fogged_color.mV); + gGL.begin(LLRender::TRIANGLES); for (U32 i = 0; i < nRows; i++) -- cgit v1.2.3 From d5217ec883e298e3cee4149cfb46f952391e83d1 Mon Sep 17 00:00:00 2001 From: mobserveur Date: Fri, 28 Jun 2024 13:41:44 +0200 Subject: fps limiter setting in app_settings.xml MaxFPS settings type and description changed --- indra/newview/app_settings/settings.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a07396b5b1..00c7eae9bc 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2468,7 +2468,7 @@ Value 0 - DoubleClickTeleport + DoubleClickTeleport Comment Enable double-click to teleport where allowed (afects minimap and people panel) @@ -8898,7 +8898,7 @@ Value 1 - + RenderReflectionDetail Comment @@ -8965,7 +8965,7 @@ Value 1 - + RenderReflectionProbeDrawDistance Comment @@ -9153,7 +9153,7 @@ Value 0.7 - + RenderReflectionProbeMaxLocalLightAmbiance Comment @@ -10589,7 +10589,7 @@ Boolean Value 0 - + NearbyListShowMap Comment @@ -13477,13 +13477,13 @@ MaxFPS Comment - OBSOLETE UNUSED setting. + FPS Limiter. Persist 1 Type - F32 + U32 Value - -1.0 + 0 ZoomDirect @@ -15384,7 +15384,7 @@ Type Boolean Value - 1 + 1 UpdateAppWindowTitleBar -- cgit v1.2.3 From 5d578f69df6ad00e51d1c2902a1f304f4d942e61 Mon Sep 17 00:00:00 2001 From: mobserveur Date: Fri, 28 Jun 2024 13:43:29 +0200 Subject: Faster Zoom in avatars Adjusted value for MAX_ANIM_SECONDS in llagentcamera.cpp --- indra/newview/llagentcamera.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 1912d9d1d5..8e8d7e6c50 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -2663,9 +2663,9 @@ void LLAgentCamera::setCameraPosAndFocusGlobal(const LLVector3d& camera_pos, con if (mCameraAnimating) { - const F64 ANIM_METERS_PER_SECOND = 10.0; + const F64 ANIM_METERS_PER_SECOND = 15.0; const F64 MIN_ANIM_SECONDS = 0.5; - const F64 MAX_ANIM_SECONDS = 10.0; + const F64 MAX_ANIM_SECONDS = 3.0; F64 anim_duration = llmax( MIN_ANIM_SECONDS, sqrt(focus_delta_squared) / ANIM_METERS_PER_SECOND ); anim_duration = llmin( anim_duration, MAX_ANIM_SECONDS ); setAnimationDuration( (F32)anim_duration ); -- cgit v1.2.3 From 095bf053f148dac958158f6709303bf09fbcd719 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Tue, 25 Jun 2024 08:00:24 +0800 Subject: Get Dullahan working again on Debian/Ubuntu After the Maintenance B merge, ironically it was Fedora's web functionality that worked out of the box (after only `patchelf --remove-rpath`-ing the dullahan_host binary from LL's v1.14.0-r2 release, since rpmbuild wouldn't allow non-existent paths). On Debian/Ubuntu somehow it wasn't working any more. It would complain about "No usable sandbox!" in (the new, replacing cef_log.txt) cef.log. The fix was done just by removing the chrome-sandbox' setuid permission (that's been turned on all this time following the common practice for CEF-based apps). On Fedora, it still works without setuid off. It may not have been needed after all, and it's safer anyway that we don't need to elevate the permission to use the effective UID of root to run the sandbox. --- indra/newview/ViewerInstall.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index 3ad4cc72f9..e648d8cc47 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -23,8 +23,9 @@ if (LINUX) install(PROGRAMS ${AUTOBUILD_INSTALL_DIR}/bin/release/chrome-sandbox DESTINATION libexec/${VIEWER_BINARY_NAME} - PERMISSIONS SETUID OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + #PERMISSIONS SETUID OWNER_READ OWNER_WRITE OWNER_EXECUTE + #GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + ) install(PROGRAMS ${AUTOBUILD_INSTALL_DIR}/bin/release/dullahan_host DESTINATION libexec/${VIEWER_BINARY_NAME}) -- cgit v1.2.3 From 20b54d6c7ed671dd7a6e5b2518d338d67e81a543 Mon Sep 17 00:00:00 2001 From: mobserveur Date: Sat, 29 Jun 2024 22:50:42 +0200 Subject: Reworked fps limiter code This improves the realiability of the fps limiter --- indra/newview/llappviewer.cpp | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 2d65c725b5..0f1b5a789b 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -393,7 +393,6 @@ static std::string gLaunchFileOnQuit; // Used on Win32 for other apps to identify our window (eg, win_setup) const char* const VIEWER_WINDOW_CLASSNAME = "Second Life"; -U64 fpsLimitSleepUntil = 0; // fps limiter : time until to render the frame again //---------------------------------------------------------------------------- @@ -1373,21 +1372,11 @@ bool LLAppViewer::frame() bool LLAppViewer::doFrame() { + static LLCachedControl fpsLimitMaxFps(gSavedSettings, "MaxFPS", 0); - // FPS Limit - - U64 fpsLimitNow = LLTrace::BlockTimer::getCPUClockCount64(); - U64 fpsLimitFrameStartTime = fpsLimitNow; - if(fpsLimitSleepUntil > 0) - { - if(fpsLimitSleepUntil > fpsLimitNow) return 0; - } - else - { - fpsLimitSleepUntil = 0; - } - - + U64 fpsLimitSleepFor = 0; + U64 fpsLimitFrameStartTime = 0; + if(fpsLimitMaxFps > 0) fpsLimitFrameStartTime = LLTrace::BlockTimer::getCPUClockCount64(); LL_RECORD_BLOCK_TIME(FTM_FRAME); { @@ -1559,24 +1548,17 @@ bool LLAppViewer::doFrame() } } - // fps limiter - - fpsLimitNow = LLTrace::BlockTimer::getCPUClockCount64(); - U64 fpsLimitFrameTime = fpsLimitNow - fpsLimitFrameStartTime; - static LLCachedControl fpsLimitMaxFps(gSavedSettings, "MaxFPS", 0); - if(fpsLimitMaxFps > 0) { + U64 fpsLimitFrameTime = LLTrace::BlockTimer::getCPUClockCount64() - fpsLimitFrameStartTime; U64 desired_time_ns = (U32)(1000000.f / fpsLimitMaxFps); - if(fpsLimitFrameTime < desired_time_ns) + if((fpsLimitFrameTime+1000) < desired_time_ns) { - U64 fpsLimitSleepUntil_for = desired_time_ns - fpsLimitFrameTime; - fpsLimitSleepUntil = LLTrace::BlockTimer::getCPUClockCount64() + fpsLimitSleepUntil_for; + fpsLimitSleepFor = (desired_time_ns - fpsLimitFrameTime - 1000) * 1.0; } } - { LL_PROFILE_ZONE_NAMED_CATEGORY_APP( "df pauseMainloopTimeout" ) pingMainloopTimeout("Main:Sleep"); @@ -1589,6 +1571,11 @@ bool LLAppViewer::doFrame() //LL_RECORD_BLOCK_TIME(SLEEP2); LL_PROFILE_ZONE_WARN( "Sleep2" ) + if(fpsLimitSleepFor) + { + usleep(fpsLimitSleepFor); + } + // yield some time to the os based on command line option static LLCachedControl yield_time(gSavedSettings, "YieldTime", -1); if(yield_time >= 0) -- cgit v1.2.3 From 721c63ff6e1df8e4f4a57a27842e05b24f4fd6f9 Mon Sep 17 00:00:00 2001 From: fowlerdm Date: Fri, 28 Jun 2024 22:06:02 -0600 Subject: Window_Background/Foreground adjustment Make outline slightly less transparent --- .../default/textures/windows/Window_Background.png | Bin 6567 -> 6780 bytes .../default/textures/windows/Window_Foreground.png | Bin 6677 -> 6900 bytes 2 files changed, 0 insertions(+), 0 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/textures/windows/Window_Background.png b/indra/newview/skins/default/textures/windows/Window_Background.png index 04d1c05e2e..f19fb0300b 100644 Binary files a/indra/newview/skins/default/textures/windows/Window_Background.png and b/indra/newview/skins/default/textures/windows/Window_Background.png differ diff --git a/indra/newview/skins/default/textures/windows/Window_Foreground.png b/indra/newview/skins/default/textures/windows/Window_Foreground.png index d74db0de7e..15d2ff72b6 100644 Binary files a/indra/newview/skins/default/textures/windows/Window_Foreground.png and b/indra/newview/skins/default/textures/windows/Window_Foreground.png differ -- cgit v1.2.3 From 3e97d66065e78c0711cd1ec544d3a4ef03200aca Mon Sep 17 00:00:00 2001 From: fowlerdm Date: Sat, 29 Jun 2024 01:06:13 -0600 Subject: first_login_image.jpg tweak add pirate theme! --- .../default/textures/windows/first_login_image.jpg | Bin 104529 -> 398853 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/textures/windows/first_login_image.jpg b/indra/newview/skins/default/textures/windows/first_login_image.jpg index 30f31341ed..860fed4ac7 100644 Binary files a/indra/newview/skins/default/textures/windows/first_login_image.jpg and b/indra/newview/skins/default/textures/windows/first_login_image.jpg differ -- cgit v1.2.3 From 550db5044648a4a6b7d7fa884d542824ffd7c798 Mon Sep 17 00:00:00 2001 From: fowlerdm Date: Sat, 29 Jun 2024 01:06:40 -0600 Subject: Linden_Dollar_Background.png tweak Less ugly alternative --- .../textures/widgets/Linden_Dollar_Background.png | Bin 153649 -> 130294 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png b/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png index f80b77aab5..f3b3d796f6 100644 Binary files a/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png and b/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png differ -- cgit v1.2.3 From facf3ce0c8554896e2183e4a4e4588b81e5100d5 Mon Sep 17 00:00:00 2001 From: fowlerdm Date: Sat, 29 Jun 2024 23:35:19 -0600 Subject: Linden_Dollar_Background.png More transparency --- .../textures/widgets/Linden_Dollar_Background.png | Bin 130294 -> 130520 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png b/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png index f3b3d796f6..6e71ef7b72 100644 Binary files a/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png and b/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png differ -- cgit v1.2.3 From 1478ec8e9c50eba8b3a64fb9c2fc54a3a328510b Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Sat, 29 Jun 2024 09:43:08 +0800 Subject: Fast timer view had a maybe uninitialised variable that GCC did't like. Adding a compile flag to the file didn't help somehow. So we're just initialising it with float 0.0. --- indra/newview/llfasttimerview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index 843bdfa42d..4851f65c48 100644 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -1096,7 +1096,7 @@ void LLFastTimerView::drawLineGraph() cur_max_calls = llmax(cur_max_calls, calls); } F32 x = mGraphRect.mRight - j * (F32)(mGraphRect.getWidth())/(mRecording.getNumRecordedPeriods()-1); - F32 y; + F32 y = 0.0; switch(mDisplayType) { case DISPLAY_TIME: -- cgit v1.2.3