From 8d08048a8451c50f1a0420496bdf809fbd9453c7 Mon Sep 17 00:00:00 2001 From: Nicky Date: Wed, 3 Apr 2019 00:23:31 +0200 Subject: [PATCH 01/11] FIRE-23808; start the correct SLVoice executable (needs .exe extension). --- indra/newview/llvoicevivox.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 69c81c2973..c9bd736783 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -862,7 +862,7 @@ bool LLVivoxVoiceClient::startAndLaunchDaemon() if( !viewerUsesWineForVoice() ) gDirUtilp->append(exe_path, "SLVoice"); // native version else - gDirUtilp->append(exe_path, "win32/SLVoice"); // use bundled win32 version + gDirUtilp->append(exe_path, "win32/SLVoice.exe"); // use bundled win32 version // #endif // See if the vivox executable exists From f19447c3bec059d8bf70ee6f9c02c11e8a8cc131 Mon Sep 17 00:00:00 2001 From: Nicky Date: Wed, 3 Apr 2019 00:24:27 +0200 Subject: [PATCH 02/11] Correct some more warning instances of newer GCC and old boost not being a happy couple. --- indra/llmath/llcalc.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/indra/llmath/llcalc.cpp b/indra/llmath/llcalc.cpp index edc6986cc9..f063b877a5 100644 --- a/indra/llmath/llcalc.cpp +++ b/indra/llmath/llcalc.cpp @@ -24,6 +24,15 @@ * */ +// Disable some warnings on newer GCC versions. (Camd with GCC >= 8.2 +#if LL_LINUX + #pragma GCC diagnostic ignored "-Wuninitialized" + #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ ) >= 80200 + #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" + #endif +#endif +// + #include "linden_common.h" #include "llcalc.h" From 406220fa40935749a3485d85a814a3a8c4859828 Mon Sep 17 00:00:00 2001 From: Nicky Date: Wed, 3 Apr 2019 00:25:17 +0200 Subject: [PATCH 03/11] Initialize variables to make GCC all happy and cheerful. --- indra/newview/llhttpretrypolicy.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/llhttpretrypolicy.cpp b/indra/newview/llhttpretrypolicy.cpp index 6a2daeeb90..5336376017 100644 --- a/indra/newview/llhttpretrypolicy.cpp +++ b/indra/newview/llhttpretrypolicy.cpp @@ -91,14 +91,14 @@ void LLAdaptiveRetryPolicy::onSuccess() void LLAdaptiveRetryPolicy::onFailure(S32 status, const LLSD& headers) { - F32 retry_header_time; + F32 retry_header_time{0}; bool has_retry_header_time = getRetryAfter(headers,retry_header_time); onFailureCommon(status, has_retry_header_time, retry_header_time); } void LLAdaptiveRetryPolicy::onFailure(const LLCore::HttpResponse *response) { - F32 retry_header_time; + F32 retry_header_time{0}; const LLCore::HttpHeaders::ptr_t headers = response->getHeaders(); bool has_retry_header_time = getRetryAfter(headers,retry_header_time); onFailureCommon(response->getStatus().getType(), has_retry_header_time, retry_header_time); From 8d8a3e45b2b5d29c509327dc0be5298c283cead4 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Wed, 20 Mar 2019 19:40:14 +0200 Subject: [PATCH 04/11] Backed out changeset: 29f763ea2f9b The fix caused SL-10357 --- indra/newview/pipeline.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 6090c7a8e6..ecad8035dc 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -2632,8 +2632,8 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl LLSpatialPartition* part = region->getSpatialPartition(i); if (part) { - if (LLViewerRegion::PARTITION_BRIDGE == i || hasRenderType(part->mDrawableType)) - { //pass PARTITION BRIDGE because LLDrawable can be moved to this partition + if (hasRenderType(part->mDrawableType)) + { part->cull(camera); } } From ef728f2a89ac320ba1b20ad9eb929bb52ba2b565 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Wed, 3 Apr 2019 12:35:51 -0700 Subject: [PATCH 05/11] Add shader unloads for new deferred avatar/attachment alpha/mask shadow shaders. --- indra/newview/llviewershadermgr.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index fef71f19f7..d8b193bd99 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -1165,9 +1165,13 @@ BOOL LLViewerShaderMgr::loadShadersDeferred() gDeferredSoftenWaterProgram.unload(); gDeferredShadowProgram.unload(); gDeferredShadowCubeProgram.unload(); - gDeferredShadowAlphaMaskProgram.unload(); + gDeferredShadowAlphaMaskProgram.unload(); gDeferredAvatarShadowProgram.unload(); + gDeferredAvatarAlphaShadowProgram.unload(); + gDeferredAvatarAlphaMaskShadowProgram.unload(); gDeferredAttachmentShadowProgram.unload(); + gDeferredAttachmentAlphaShadowProgram.unload(); + gDeferredAttachmentAlphaMaskShadowProgram.unload(); gDeferredAvatarProgram.unload(); gDeferredAvatarAlphaProgram.unload(); gDeferredAlphaProgram.unload(); From e8dd462d00088a7f0a74cace21d2c3574b00898e Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Fri, 5 Apr 2019 15:49:44 +0200 Subject: [PATCH 06/11] Polish translation update --- .../default/xui/pl/floater_preferences_graphics_advanced.xml | 1 + indra/newview/skins/default/xui/pl/notifications.xml | 4 ---- .../skins/default/xui/pl/panel_preferences_graphics1.xml | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml index deb925aad5..02b4b7eb94 100644 --- a/indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml @@ -33,6 +33,7 @@ + Antyaliasing: diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml index a8163c6e15..415c1dde4e 100644 --- a/indra/newview/skins/default/xui/pl/notifications.xml +++ b/indra/newview/skins/default/xui/pl/notifications.xml @@ -1548,10 +1548,6 @@ Jeśli ciągle widzisz tą wiadomość sprawdź [SUPPORT_SITE]. Otwieranie stron internetowych z nieznanego źródła może narazić Twój komputer na niebezpieczeństwo. - - Mnożnik systemowego skalowania interfejsu uległ zmianie od ostatniego uruchomienia. Czy chcesz otworzyć ustawienia i skorygować skalowanie interfejsu w przeglądarce? - - By dokonać zmian i aktualizacji swojego konta, odwiedź [http://secondlife.com/account/ Tablicę]. diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml index b3fa58ca0f..a70dbf6558 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml @@ -106,6 +106,7 @@ + Antyaliasing (zalecany restart): From a85f97fbc7d61d35580bab17f0a9078547c780ae Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 6 Apr 2019 02:13:10 +0200 Subject: [PATCH 07/11] Reset UI scale factor on first run if OS display scaling is not set to 100% --- indra/newview/app_settings/settings.xml | 15 ++++++++++++++- indra/newview/llviewerwindow.cpp | 11 +++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index d4aa207453..83e5b7cbb1 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -25155,7 +25155,7 @@ Change of this parameter will affect the layout of buttons in notification toast Type Boolean Value - 0 + 0 FSLookAtTargetMaxDistance @@ -25168,6 +25168,19 @@ Change of this parameter will affect the layout of buttons in notification toast Value 1 + FSResetUIScaleOnFirstRun + + Comment + Resets the UI scale factor on first run due to changed display scaling behavior + Persist + 1 + Type + Boolean + Value + 1 + Backup + 0 + diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 9641a1f935..f07c603d44 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1841,6 +1841,17 @@ LLViewerWindow::LLViewerWindow(const Params& p) LLCoordScreen scr; mWindow->getSize(&scr); + // Reset UI scale factor on first run if OS's display scaling is not 100% + if (gSavedSettings.getBOOL("FSResetUIScaleOnFirstRun")) + { + if (mWindow->getSystemUISize() != 1.f) + { + gSavedSettings.setF32("UIScaleFactor", 1.f); + } + gSavedSettings.setBOOL("FSResetUIScaleOnFirstRun", FALSE); + } + // + // Get the real window rect the window was created with (since there are various OS-dependent reasons why // the size of a window or fullscreen context may have been adjusted slightly...) F32 ui_scale_factor = llclamp(gSavedSettings.getF32("UIScaleFactor"), MIN_UI_SCALE, MAX_UI_SCALE) * mWindow->getSystemUISize(); From 85e02091ead324d5394a60d05265eab7479a0fd6 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 6 Apr 2019 15:23:21 +0200 Subject: [PATCH 08/11] Match previous change with version contributed to LL --- indra/newview/app_settings/settings.xml | 26 ++++++++++++------------- indra/newview/llviewerwindow.cpp | 7 +++---- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 83e5b7cbb1..3a4e315ccc 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -21474,6 +21474,19 @@ Change of this parameter will affect the layout of buttons in notification toast Value 0 + ResetUIScaleOnFirstRun + + Comment + Resets the UI scale factor on first run due to changed display scaling behavior + Persist + 1 + Type + Boolean + Value + 1 + Backup + 0 + FSShowServerVersionChangeNotice Comment @@ -25168,19 +25181,6 @@ Change of this parameter will affect the layout of buttons in notification toast Value 1 - FSResetUIScaleOnFirstRun - - Comment - Resets the UI scale factor on first run due to changed display scaling behavior - Persist - 1 - Type - Boolean - Value - 1 - Backup - 0 - diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index f07c603d44..40740f2865 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1841,16 +1841,15 @@ LLViewerWindow::LLViewerWindow(const Params& p) LLCoordScreen scr; mWindow->getSize(&scr); - // Reset UI scale factor on first run if OS's display scaling is not 100% - if (gSavedSettings.getBOOL("FSResetUIScaleOnFirstRun")) + // Reset UI scale factor on first run if OS's display scaling is not 100% + if (gSavedSettings.getBOOL("ResetUIScaleOnFirstRun")) { if (mWindow->getSystemUISize() != 1.f) { gSavedSettings.setF32("UIScaleFactor", 1.f); } - gSavedSettings.setBOOL("FSResetUIScaleOnFirstRun", FALSE); + gSavedSettings.setBOOL("ResetUIScaleOnFirstRun", FALSE); } - // // Get the real window rect the window was created with (since there are various OS-dependent reasons why // the size of a window or fullscreen context may have been adjusted slightly...) From b0a483bea30f3bb2b9e8e24bcc9ad812cdeb043a Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Mon, 8 Apr 2019 18:53:47 +0300 Subject: [PATCH 09/11] SL-10907 getWidthF32 crash in fonts --- indra/llwindow/llwindowwin32.cpp | 4 +--- indra/newview/llviewerwindow.cpp | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 8410c2f2a5..1549cbc150 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -4096,9 +4096,7 @@ void LLWindowWin32::setDPIAwareness() F32 LLWindowWin32::getSystemUISize() { - // Type fix - //float scale_value = 0; - F32 scale_value = 0.f; + F32 scale_value = 1.f; HWND hWnd = (HWND)getPlatformWindow(); HDC hdc = GetDC(hWnd); HMONITOR hMonitor; diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 40740f2865..fade2aed76 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1853,7 +1853,7 @@ LLViewerWindow::LLViewerWindow(const Params& p) // Get the real window rect the window was created with (since there are various OS-dependent reasons why // the size of a window or fullscreen context may have been adjusted slightly...) - F32 ui_scale_factor = llclamp(gSavedSettings.getF32("UIScaleFactor"), MIN_UI_SCALE, MAX_UI_SCALE) * mWindow->getSystemUISize(); + F32 ui_scale_factor = llclamp(gSavedSettings.getF32("UIScaleFactor") * mWindow->getSystemUISize(), MIN_UI_SCALE, MAX_UI_SCALE); mDisplayScale.setVec(llmax(1.f / mWindow->getPixelAspectRatio(), 1.f), llmax(mWindow->getPixelAspectRatio(), 1.f)); mDisplayScale *= ui_scale_factor; @@ -6587,7 +6587,7 @@ F32 LLViewerWindow::getWorldViewAspectRatio() const void LLViewerWindow::calcDisplayScale() { - F32 ui_scale_factor = llclamp(gSavedSettings.getF32("UIScaleFactor"), MIN_UI_SCALE, MAX_UI_SCALE) * mWindow->getSystemUISize(); + F32 ui_scale_factor = llclamp(gSavedSettings.getF32("UIScaleFactor") * mWindow->getSystemUISize(), MIN_UI_SCALE, MAX_UI_SCALE); LLVector2 display_scale; display_scale.setVec(llmax(1.f / mWindow->getPixelAspectRatio(), 1.f), llmax(mWindow->getPixelAspectRatio(), 1.f)); display_scale *= ui_scale_factor; From 310e86f885e458f368b81732ae6af01feaaa890c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 11 Apr 2019 23:00:08 +0200 Subject: [PATCH 10/11] FIRE-22110: Add /zoffset_reset command line parameter to reset hover height to 0 --- indra/newview/chatbar_as_cmdline.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/indra/newview/chatbar_as_cmdline.cpp b/indra/newview/chatbar_as_cmdline.cpp index f842c51971..6b68f8e158 100644 --- a/indra/newview/chatbar_as_cmdline.cpp +++ b/indra/newview/chatbar_as_cmdline.cpp @@ -815,6 +815,11 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge gSavedPerAccountSettings.setF32("AvatarHoverOffsetZ", gSavedPerAccountSettings.getF32("AvatarHoverOffsetZ") - 0.05f); return false; } + else if (command == "/zoffset_reset") + { + gSavedPerAccountSettings.setF32("AvatarHoverOffsetZ", 0.f); + return false; + } else if (command == sFSCmdLineOfferTp()) { LLUUID target_key; From dc15ea44af7279c1d01c03c6a0dbf374e3752c75 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Mon, 15 Apr 2019 12:13:31 +0300 Subject: [PATCH 11/11] SL-10898 FIXED [Mac] Camera spins and pulls back when using alt+zoom --- indra/llui/llui.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index 75516842fe..d052056adb 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -264,13 +264,9 @@ void LLUI::dirtyRect(LLRect rect) void LLUI::setMousePositionScreen(S32 x, S32 y) { S32 screen_x, screen_y; -#if defined(LL_DARWIN) - screen_x = ll_round((F32)x); - screen_y = ll_round((F32)y); -#else screen_x = ll_round((F32)x * getScaleFactor().mV[VX]); screen_y = ll_round((F32)y * getScaleFactor().mV[VY]); -#endif + LLView::getWindow()->setCursorPosition(LLCoordGL(screen_x, screen_y).convert()); }