Merge branch 'main' into maint-b

15 files changed, 90 insertions, 86 deletions

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 5d52d4b202..d282557efc 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
@@ -1475,7 +1475,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
@@ -1960,7 +1960,6 @@ target_link_libraries(${VIEWER_BINARY_NAME}
         ${LLPHYSICSEXTENSIONS_LIBRARIES}
         ll::bugsplat
         ll::tracy
-        ll::fontconfig
         )
 
 if (ENABLE_MEDIA_PLUGINS)
diff --git a/indra/newview/SecondLife.nib b/indra/newview/SecondLife.nib
index c4ddca50dc..ef0fa80b12 100644
--- a/indra/newview/SecondLife.nib
+++ b/indra/newview/SecondLife.nib
diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake
index 7ee70132c0..e648d8cc47 100644
--- a/indra/newview/ViewerInstall.cmake
+++ b/indra/newview/ViewerInstall.cmake
@@ -7,37 +7,41 @@ 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
-		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
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 943b312ace..6355d02bc9 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2468,7 +2468,7 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>DoubleClickTeleport</key> 
+    <key>DoubleClickTeleport</key>
     <map>
       <key>Comment</key>
       <string>Enable double-click to teleport where allowed (afects minimap and people panel)</string>
@@ -8909,7 +8909,7 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-  
+
   <key>RenderReflectionDetail</key>
     <map>
       <key>Comment</key>
@@ -8976,7 +8976,7 @@
     <key>Value</key>
     <real>1</real>
   </map>
-  
+
   <key>RenderReflectionProbeDrawDistance</key>
   <map>
     <key>Comment</key>
@@ -9164,7 +9164,7 @@
     <key>Value</key>
     <real>0.7</real>
   </map>
-  
+
   <key>RenderReflectionProbeMaxLocalLightAmbiance</key>
   <map>
     <key>Comment</key>
@@ -10600,7 +10600,7 @@
             <string>Boolean</string>
         <key>Value</key>
             <integer>0</integer>
-    </map> 
+    </map>
     <key>NearbyListShowMap</key>
     <map>
       <key>Comment</key>
@@ -13488,13 +13488,13 @@
     <key>MaxFPS</key>
     <map>
       <key>Comment</key>
-      <string>OBSOLETE UNUSED setting.</string>
+      <string>FPS Limiter.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>F32</string>
+      <string>U32</string>
       <key>Value</key>
-      <real>-1.0</real>
+      <real>0</real>
     </map>
     <key>ZoomDirect</key>
     <map>
@@ -15395,7 +15395,7 @@
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-    <integer>1</integer>        
+    <integer>1</integer>
   </map>
   <key>UpdateAppWindowTitleBar</key>
   <map>
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 );
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index b60efb1330..768d131073 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
@@ -385,7 +389,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
 
 //----------------------------------------------------------------------------
 
@@ -563,7 +566,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
 }
@@ -1129,7 +1136,7 @@ bool LLAppViewer::init()
 
     gGLActive = FALSE;
 
-#if LL_RELEASE_FOR_DOWNLOAD && !LL_LINUX
+#if 0 // LL_RELEASE_FOR_DOWNLOAD && !LL_LINUX
     // Skip updater if this is a non-interactive instance
     if (!gSavedSettings.getBOOL("CmdLineSkipUpdater") && !gNonInteractive)
     {
@@ -1361,21 +1368,11 @@ bool LLAppViewer::frame()
 
 bool LLAppViewer::doFrame()
 {
+    static LLCachedControl<U32> 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);
     {
@@ -1547,24 +1544,17 @@ bool LLAppViewer::doFrame()
             }
         }
 
-        // fps limiter
-
-        fpsLimitNow = LLTrace::BlockTimer::getCPUClockCount64();
-        U64 fpsLimitFrameTime = fpsLimitNow - fpsLimitFrameStartTime;
-        static LLCachedControl<U32> 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");
@@ -1577,6 +1567,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<S32> yield_time(gSavedSettings, "YieldTime", -1);
             if(yield_time >= 0)
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:
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp
index 2891f21b6a..664860db30 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;
@@ -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;
@@ -437,6 +438,7 @@ 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)
@@ -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);
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++)
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..6e71ef7b72 100644
--- a/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png
+++ b/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png
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
--- a/indra/newview/skins/default/textures/windows/Window_Background.png
+++ b/indra/newview/skins/default/textures/windows/Window_Background.png
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
--- a/indra/newview/skins/default/textures/windows/Window_Foreground.png
+++ b/indra/newview/skins/default/textures/windows/Window_Foreground.png
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
--- a/indra/newview/skins/default/textures/windows/first_login_image.jpg
+++ b/indra/newview/skins/default/textures/windows/first_login_image.jpg
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index bf653a547a..71d15ebcbb 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):
       <text_editor
        enabled="false"
        follows="top|left"
-       height="70"
+       height="90"
        bg_readonly_color="Transparent"
        left="5"
        text_color="LtGray"
@@ -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
     </text_editor>
     <text
           follows="top|left"
@@ -121,12 +124,12 @@ with special thanks to (in order of appearance):
        top_pad="5"
        width="450"
        word_wrap="true">
+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;
-Soft Linden for the security testing;
-Kyle Linden for selling TPV parcel 2 to Erik Kundiman at L$0 price; and
-Fritigern Gothly for the administrative support.
+Soft Linden for the security testing; and
+Kyle Linden for selling TPV parcel 2 to Erik Kundiman at L$0 price.
     </text_editor>
     </panel>
   </accordion_tab>
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
                         </text>
                       </layout_panel>
                     </layout_stack>