Merge branch 'main' into webrtc-voice

11 files changed, 108 insertions, 44 deletions

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 4771dbfa1c..26d60bc947 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2173,6 +2173,7 @@ if (DARWIN)
      "${VIEWER_APP_BUNDLE}/Contents/Info.plist"
     )
 
+  if (NOT INSTALL)
   add_custom_command(
     TARGET ${VIEWER_BINARY_NAME} POST_BUILD
     COMMAND ${PYTHON_EXECUTABLE}
@@ -2197,6 +2198,7 @@ if (DARWIN)
       ${VIEWER_BINARY_NAME}
       ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
     )
+  endif (NOT INSTALL)
 
   if (ENABLE_MEDIA_PLUGINS)
       if (DARWIN OR LINUX)
diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in
new file mode 100644
index 0000000000..73806642e4
--- /dev/null
+++ b/indra/newview/FixBundle.cmake.in
@@ -0,0 +1,7 @@
+include(BundleUtilities)
+
+set(dirs
+    /opt/local/lib
+   )
+
+fixup_bundle(${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app "" "${dirs}")
diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake
index e648d8cc47..7d9f160467 100644
--- a/indra/newview/ViewerInstall.cmake
+++ b/indra/newview/ViewerInstall.cmake
@@ -1,3 +1,59 @@
+if (DARWIN)
+
+    install(DIRECTORY
+        English.lproj
+        German.lproj
+        Japanese.lproj
+        Korean.lproj
+        app_settings
+        character
+        cursors_mac
+        da.lproj
+        es.lproj
+        fonts
+        fr.lproj
+        uk.lproj
+        hu.lproj
+        it.lproj
+        nl.lproj
+        pl.lproj
+        pt.lproj
+        ru.lproj
+        skins
+        tr.lproj
+        zh-Hans.lproj
+        DESTINATION ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources
+        )
+
+    install(FILES
+        SecondLife.nib
+        ${AUTOBUILD_INSTALL_DIR}/ca-bundle.crt
+        cube.dae
+        featuretable_mac.txt
+        secondlife.icns
+        DESTINATION ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources
+        )
+
+    install(FILES
+        licenses-mac.txt
+        RENAME licenses.txt
+        DESTINATION ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources
+        )
+
+    install(FILES
+        ${SCRIPTS_DIR}/messages/message_template.msg
+        ${SCRIPTS_DIR}/../etc/message.xml
+        DESTINATION ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/app_settings
+        )
+
+    configure_file(
+        ${CMAKE_CURRENT_SOURCE_DIR}/FixBundle.cmake.in
+        ${CMAKE_CURRENT_BINARY_DIR}/FixBundle.cmake
+        )
+    install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/FixBundle.cmake)
+
+else (DARWIN)
+
 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_BINARY_NAME}
         DESTINATION bin
         )
@@ -16,15 +72,19 @@ if (LINUX)
         endif ()
         install(FILES
                 ${AUTOBUILD_INSTALL_DIR}/lib/release/libcef.so
+                DESTINATION ${_LIB})
+        if (USE_FMODSTUDIO)
+            install(FILES
                 ${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})
+             DESTINATION ${_LIB})
+        endif (USE_FMODSTUDIO)
         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
@@ -65,10 +125,16 @@ else (IS_ARTWORK_PRESENT)
   message(STATUS "WARNING: Artwork is not present, and will not be installed")
 endif (IS_ARTWORK_PRESENT)
 
-install(FILES featuretable_linux.txt
-        #featuretable_solaris.txt
-        licenses.txt
+    install(FILES
         ${AUTOBUILD_INSTALL_DIR}/ca-bundle.crt
+        featuretable_linux.txt
+        #featuretable_solaris.txt
+        DESTINATION share/${VIEWER_BINARY_NAME}
+        )
+
+    install(FILES
+        licenses-linux.txt
+        RENAME licenses.txt
         DESTINATION share/${VIEWER_BINARY_NAME}
         )
 
@@ -77,6 +143,8 @@ install(FILES ${SCRIPTS_DIR}/messages/message_template.msg
         DESTINATION share/${VIEWER_BINARY_NAME}/app_settings
         )
 
-install(FILES linux_tools/${VIEWER_BINARY_NAME}.desktop
+    install(FILES linux_tools/${VIEWER_BINARY_NAME}.desktop
         DESTINATION share/applications
         )
+
+endif (DARWIN)
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 2e305cc18d..c5e0ae7034 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>
@@ -8898,7 +8898,7 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-  
+
   <key>RenderReflectionDetail</key>
     <map>
       <key>Comment</key>
@@ -8965,7 +8965,7 @@
     <key>Value</key>
     <real>1</real>
   </map>
-  
+
   <key>RenderReflectionProbeDrawDistance</key>
   <map>
     <key>Comment</key>
@@ -9153,7 +9153,7 @@
     <key>Value</key>
     <real>0.7</real>
   </map>
-  
+
   <key>RenderReflectionProbeMaxLocalLightAmbiance</key>
   <map>
     <key>Comment</key>
@@ -10589,7 +10589,7 @@
             <string>Boolean</string>
         <key>Value</key>
             <integer>0</integer>
-    </map> 
+    </map>
     <key>NearbyListShowMap</key>
     <map>
       <key>Comment</key>
@@ -13510,13 +13510,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>
@@ -15417,7 +15417,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 ab87ff6d2c..1b1a47aa0d 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<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);
     {
@@ -1559,24 +1548,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");
@@ -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<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/skins/default/textures/widgets/Linden_Dollar_Background.png b/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png
index f80b77aab5..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