From ffaca1fafacfe0cc827bc976d08bdb9a7082f73a Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 18 May 2018 09:43:59 +0200 Subject: [PATCH 01/14] Fix XML syntax error --- indra/newview/skins/default/xui/it/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index 31326f77c0..fd1edeaa94 100644 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -69,6 +69,7 @@ Qualità di rendering: [RENDERQUALITY] Ombre Attive: [ALMSTATUS] Memoria texture: [TEXTUREMEMORY] MB ([TEXTUREMEMORYMULTIPLIER]) Tempo di creazione VFS (cache) (UTC): [VFS_DATE] + API RestrainedLove: [RLV_VERSION] Versione di libcurl: [LIBCURL_VERSION] @@ -77,7 +78,6 @@ Versione del driver audio: [AUDIO_DRIVER_VERSION] [LIBCEF_VERSION] Versione di LibVLC: [LIBVLC_VERSION] Versione server vocale: [VOICE_VERSION] - Pacchetti perduti: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%) From 3884279e175cc41caf3dc63c4e059942d2f0ad6a Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 18 May 2018 10:04:30 +0200 Subject: [PATCH 02/14] Fix some system information localizations --- indra/newview/skins/default/xui/es/strings.xml | 5 +++-- indra/newview/skins/default/xui/ru/strings.xml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index b724eb7f25..56961a5a0f 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -34,7 +34,7 @@ Error de inicialización de gráficos. Actualiza tu controlador de gráficos. - [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([ADDRESS_SIZE]bit) ([CHANNEL]) + [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL] [ADDRESS_SIZE]bit) [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] @@ -64,10 +64,11 @@ Tarjeta gráfica: [GRAPHICS_CARD] Versión de OpenGL: [OPENGL_VERSION] +RestrainedLove API: [RLV_VERSION] Versión de libcurl: [LIBCURL_VERSION] Versión de J2C Decoder: [J2C_VERSION] Versión de Audio Driver: [AUDIO_DRIVER_VERSION] -Versión de CEF: [LIBCEF_VERSION] +[LIBCEF_VERSION] Versión de LibVLC: [LIBVLC_VERSION] Versión del servidor de voz: [VOICE_VERSION] diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml index a837e6b151..e7fb6c7416 100644 --- a/indra/newview/skins/default/xui/ru/strings.xml +++ b/indra/newview/skins/default/xui/ru/strings.xml @@ -41,7 +41,7 @@ Инициализация графики не удалась. Пожалуйста, обновите драйвер видеокарты! - [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([ADDRESS_SIZE]bit) ([CHANNEL]) [BUILD_TYPE] + [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL] [ADDRESS_SIZE]bit) [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] @@ -75,13 +75,14 @@ SLURL: <nolink>[SLURL]</nolink> Версия libcurl: [LIBCURL_VERSION] Версия декодера J2C: [J2C_VERSION] Версия драйвера звука: [AUDIO_DRIVER_VERSION] -Версия CEF: [LIBCEF_VERSION] +[LIBCEF_VERSION] Версия LibVLC: [LIBVLC_VERSION] Версия голосового сервера: [VOICE_VERSION] Режим настроек: [MODE] Графическое оформление: [SKIN] ([THEME]) +Window size: [WINDOW_WIDTH]x[WINDOW_HEIGHT] px Используемый шрифт: [FONT] ([FONT_SCREEN_DPI]) Размер шрифта: [FONT_SIZE] pt Масштаб UI: [UI_SCALE_FACTOR] From 08a453187b1239e6a5c28c7366bccd6cff9a669a Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 18 May 2018 14:45:33 +0200 Subject: [PATCH 03/14] Refactor hover height debug setting handler --- indra/newview/llviewercontrol.cpp | 13 +------------ indra/newview/llvoavatarself.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index 40073b7ecd..48ce18e105 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -199,18 +199,7 @@ static bool handleAvatarHoverOffsetChanged(const LLSD& newvalue) { if (isAgentAvatarValid()) { - // [Legacy bake] - //gAgentAvatarp->setHoverIfRegionEnabled(); - if (gAgent.getRegion()->avatarHoverHeightEnabled()) - { - LLVector3 avOffset(0.0f, 0.0f, llclamp(newvalue.asReal(), MIN_HOVER_Z, MAX_HOVER_Z)); - gAgentAvatarp->setHoverOffset(avOffset, true); - } - else if (!gAgentAvatarp->isUsingServerBakes()) - { - gAgentAvatarp->computeBodySize(); - } - // [Legacy bake] + gAgentAvatarp->setHoverIfRegionEnabled(); } return true; } diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 50c7b449c2..2ec6e0b318 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -296,6 +296,12 @@ void LLVOAvatarSelf::setHoverIfRegionEnabled() setHoverOffset(LLVector3(0.0, 0.0, llclamp(hover_z,MIN_HOVER_Z,MAX_HOVER_Z))); LL_INFOS("Avatar") << avString() << " set hover height from debug setting " << hover_z << LL_ENDL; } + // [Legacy bake] + else if (!isUsingServerBakes()) + { + computeBodySize(); + } + // [Legacy bake] else { setHoverOffset(LLVector3(0.0, 0.0, 0.0)); From 0bdbf2622a0ed29864e69d8a2aeb62d48544d517 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Fri, 18 May 2018 14:52:25 +0200 Subject: [PATCH 04/14] Updated Polish translation --- indra/newview/skins/default/xui/pl/floater_buy_land.xml | 2 +- indra/newview/skins/default/xui/pl/menu_viewer.xml | 1 - indra/newview/skins/default/xui/pl/notifications.xml | 8 ++------ indra/newview/skins/default/xui/pl/strings.xml | 3 +-- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/indra/newview/skins/default/xui/pl/floater_buy_land.xml b/indra/newview/skins/default/xui/pl/floater_buy_land.xml index 0d57d1f851..15b3c1d236 100644 --- a/indra/newview/skins/default/xui/pl/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/pl/floater_buy_land.xml @@ -210,7 +210,7 @@ Działka ta zawiera 512 m² ziemi. Masz 2,100 L$. -