From ff619528897f7f3919f3eb501e3afce62f5a23dd Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <pantera.polnocy@phoenixviewer.com>
Date: Mon, 15 Feb 2021 19:26:20 +0100
Subject: [PATCH 1/7] Updated Polish translation

---
 .../skins/default/xui/pl/panel_preferences_UI.xml  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_UI.xml b/indra/newview/skins/default/xui/pl/panel_preferences_UI.xml
index 82f2e915e5..8d4349ec5e 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_UI.xml
@@ -98,6 +98,20 @@
         <check_box label="Pokaż wyszukiwarkę pozycji w menu" name="show_search_menu_check" />
         <check_box label="Pokaż stan konta" name="FSShowCurrencyBalanceInStatusbar" />
         <check_box label="Włącz autorozwijanie menusów przy wskazywaniu ikon na pasku" name="FSStatusBarMenuButtonPopupOnRollover" />
+        <text name="statusbar_timeformat_textbox">
+            Format czasu:
+        </text>
+        <combo_box name="FSStatusBarTimeFormat" tool_tip="Wybierz format czasu używany na pasku głównego menu.">
+            <combo_box.item label="Domyślny języka" name="Language" />
+            <combo_box.item label="12-godzinny" name="12_Hour" />
+            <combo_box.item label="12-godzinny z sekundami" name="12_Hour_Seconds" />
+            <combo_box.item label="12-godzinny ze strefą czasową" name="12_Hour_TZ" />
+            <combo_box.item label="12-godzinny ze strefą czasową i sekundami" name="12_Hour_TZ_Seconds" />
+            <combo_box.item label="24-godzinny" name="24_Hour" />
+            <combo_box.item label="24-godzinny z sekundami" name="24_Hour_Seconds" />
+            <combo_box.item label="24-godzinny ze strefą czasową" name="24_Hour_TZ" />
+            <combo_box.item label="24-godzinny ze strefą czasową i sekundami" name="24_Hour_TZ_Seconds" />
+        </combo_box>
         <text name="navfav_textbox">
             Paski nawigacji i ulubionych:
         </text>

From 214632c171d7d3aa2fb0685692899f801f963d27 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <pantera.polnocy@phoenixviewer.com>
Date: Mon, 15 Feb 2021 19:44:27 +0100
Subject: [PATCH 2/7] Russian translation update, by Romka Swallowtail

---
 .../default/xui/ru/floater_fs_asset_blacklist.xml  |  4 +++-
 .../skins/default/xui/ru/panel_preferences_UI.xml  | 14 ++++++++++++++
 .../newview/skins/default/xui/ru/rlva_strings.xml  |  5 +++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/ru/floater_fs_asset_blacklist.xml b/indra/newview/skins/default/xui/ru/floater_fs_asset_blacklist.xml
index e144adb338..6b7713bc5a 100644
--- a/indra/newview/skins/default/xui/ru/floater_fs_asset_blacklist.xml
+++ b/indra/newview/skins/default/xui/ru/floater_fs_asset_blacklist.xml
@@ -33,6 +33,8 @@
 		<columns name="permanent" label="Постоянно"/>
 	</fs_scroll_list>
 	<button name="remove_btn" label="Удалить из черного списка" width="190"/>
-	<button name="remove_temp_btn" label="Удалить не постоянные" width="190" />
+	<button name="remove_temp_btn" label="Удалить не постоянные" width="170" />
+	<button name="play_btn" label="Проиграть звук" tool_tip="Воспроизвести выбранный звук; для воспроизведения можно выбрать только одну звуковую запись." width="120"/>
+	<button name="stop_btn" label="Остановить звук" tool_tip="Остановить воспроизведение текущего звука." width="120"/>
 	<button name="close_btn" label="Закрыть"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_UI.xml b/indra/newview/skins/default/xui/ru/panel_preferences_UI.xml
index 73bc9e014a..7c8d8529bf 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_UI.xml
@@ -102,6 +102,20 @@
 		<check_box label="Показать поиск в меню" name="show_search_menu_check"/>
 		<check_box label="Показать текущий баланс L$" name="FSShowCurrencyBalanceInStatusbar"/>
 		<check_box label="Включить выпадающие окна меню мыши на значках верхнего меню" name="FSStatusBarMenuButtonPopupOnRollover" width="270" />
+		<text name="statusbar_timeformat_textbox" width="100">
+			Формат времени:
+		</text>
+		<combo_box name="FSStatusBarTimeFormat" tool_tip="Выбирает формат времени, используемый в строке главного меню." width="250">
+			<combo_box.item label="Стандарт выбранного языка" name="Language"/>
+			<combo_box.item label="12 Часов" name="12_Hour"/>
+			<combo_box.item label="12 Часов с Секундами" name="12_Hour_Seconds"/>
+			<combo_box.item label="12 Часов с Часовым поясом" name="12_Hour_TZ"/>
+			<combo_box.item label="12 Часов с Секундами и Часовым поясом" name="12_Hour_TZ_Seconds"/>
+			<combo_box.item label="24 Часа" name="24_Hour"/>
+			<combo_box.item label="24 Часа с Секундами" name="24_Hour_Seconds"/>
+			<combo_box.item label="24 Часа с Часовым поясом" name="24_Hour_TZ"/>
+			<combo_box.item label="24 Часа с Секундами и Часовым поясом" name="24_Hour_TZ_Seconds"/>
+		</combo_box>
 		<text name="navfav_textbox">
 		Панель навигации и закладок:
 		</text>
diff --git a/indra/newview/skins/default/xui/ru/rlva_strings.xml b/indra/newview/skins/default/xui/ru/rlva_strings.xml
index 76a29d7ab2..9f80ba7cd0 100644
--- a/indra/newview/skins/default/xui/ru/rlva_strings.xml
+++ b/indra/newview/skins/default/xui/ru/rlva_strings.xml
@@ -136,6 +136,11 @@
 			<key>value</key>
 			<string>'[OBJECT]' было отказано в разрешении телепортировать вас из-за ограничений RLV</string>
 		</map>
+		<key>blocked_scriptdialog</key>
+		<map>
+			<key>value</key>
+			<string>Невозможно отобразить диалоговое окно или текстовое поле скрипта из-за ограничений RLV</string>
+		</map>
 		<key>blocked_startim</key>
 		<map>
 			<key>value</key>

From 9af27dd18a090b8ef99711784b03773255eb6fba Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Mon, 15 Feb 2021 20:19:14 +0100
Subject: [PATCH 3/7] [FIXED] AMD shader compile error + just have anyone with
 older drivers/hardware load the explicit one for now

---
 .../app_settings/shaders/class1/deferred/rlvF.glsl       | 2 +-
 .../class1/deferred/{rlvFMac.glsl => rlvFLegacy.glsl}    | 0
 indra/newview/llviewershadermgr.cpp                      | 9 ++++-----
 3 files changed, 5 insertions(+), 6 deletions(-)
 rename indra/newview/app_settings/shaders/class1/deferred/{rlvFMac.glsl => rlvFLegacy.glsl} (100%)

diff --git a/indra/newview/app_settings/shaders/class1/deferred/rlvF.glsl b/indra/newview/app_settings/shaders/class1/deferred/rlvF.glsl
index 8661ffe923..4875523fb2 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/rlvF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/rlvF.glsl
@@ -147,7 +147,7 @@ void main()
 			break;
 		case 2:		// Blur (variable)
 			fragColor = texture2DRect(diffuseRect, fragTC).rgb;
-			fragColor = mix(fragColor, blurVariable(diffuseRect, fragTC, SPHERE_PARAMS.x, BLUR_DIRECTION, effectStrength), effectStrength > 0);
+			fragColor = mix(fragColor, blurVariable(diffuseRect, fragTC, SPHERE_PARAMS.x, BLUR_DIRECTION, effectStrength), int(effectStrength > 0));
 			break;
 		case 3:		// ChromaticAberration
 			fragColor = chromaticAberration(diffuseRect, fragTC, SPHERE_PARAMS.xy, SPHERE_PARAMS.zw, effectStrength);
diff --git a/indra/newview/app_settings/shaders/class1/deferred/rlvFMac.glsl b/indra/newview/app_settings/shaders/class1/deferred/rlvFLegacy.glsl
similarity index 100%
rename from indra/newview/app_settings/shaders/class1/deferred/rlvFMac.glsl
rename to indra/newview/app_settings/shaders/class1/deferred/rlvFLegacy.glsl
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index d84649f3f5..3ca714fd46 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -4162,11 +4162,10 @@ BOOL LLViewerShaderMgr::loadShadersWindLight()
 		gRlvSphereProgram.mName = "RLVa Sphere Post Processing Shader";
 		gRlvSphereProgram.mShaderFiles.clear();
 		gRlvSphereProgram.mShaderFiles.push_back(make_pair("deferred/rlvV.glsl", GL_VERTEX_SHADER_ARB));
-#ifndef LL_DARWIN
-		gRlvSphereProgram.mShaderFiles.push_back(make_pair("deferred/rlvF.glsl", GL_FRAGMENT_SHADER_ARB));
-#else
-		gRlvSphereProgram.mShaderFiles.push_back(make_pair("deferred/rlvFMac.glsl", GL_FRAGMENT_SHADER_ARB));
-#endif
+ 		if (gGLManager.mGLVersion >= 4.5f)
+			gRlvSphereProgram.mShaderFiles.push_back(make_pair("deferred/rlvF.glsl", GL_FRAGMENT_SHADER_ARB));
+		else
+			gRlvSphereProgram.mShaderFiles.push_back(make_pair("deferred/rlvFLegacy.glsl", GL_FRAGMENT_SHADER_ARB));
 		gRlvSphereProgram.mShaderLevel = mShaderLevel[SHADER_WINDLIGHT];
 		success = gRlvSphereProgram.createShader(NULL, NULL);
 	}

From b537d828f6314f3054ec077b80f28fb6aae8955e Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Mon, 15 Feb 2021 22:35:05 +0100
Subject: [PATCH 4/7] FIRE-20390: Fix copy & paste error

---
 indra/newview/skins/default/xui/en/panel_preferences_UI.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
index edd663a329..cc001bf7d6 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
@@ -772,7 +772,7 @@
 			<combo_box.item
 			 label="24 Hour incl. Timezone"
 			 name="24_Hour_TZ"
-			 value="12 Hour TZ"/>
+			 value="24 Hour TZ"/>
 			<combo_box.item
 			 label="24 Hour incl. Seconds &amp; Timezone"
 			 name="24_Hour_TZ_Seconds"

From 27d22824c43e01534a0da09f2bf2f8cdcf218852 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 16 Feb 2021 12:13:34 +0100
Subject: [PATCH 5/7] Increment version

---
 indra/newview/VIEWER_VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index 0438a6cd91..df41a3918c 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-6.4.13
+6.4.14

From f5f7c9e2ab29fe63345d23794b1d1d7f2bb26419 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 17 Feb 2021 09:31:19 +0100
Subject: [PATCH 6/7] FIRE-30762: Small camera floater background opacity not
 correct

---
 indra/newview/skins/default/xui/en/floater_fs_camera_small.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en/floater_fs_camera_small.xml b/indra/newview/skins/default/xui/en/floater_fs_camera_small.xml
index 4e6ad8ef75..e7e327df9b 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_camera_small.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_camera_small.xml
@@ -3,7 +3,8 @@
 <floater
  legacy_header_height="0"
  header_height="0"
- bg_alpha_image_overlay="LtGray_50"
+ bg_opaque_image="Window_NoTitle_Foreground"
+ bg_alpha_image="Window_NoTitle_Foreground"
  can_dock="false"
  can_minimize="false"
  can_resize="true"

From 10738b1447b1fa0e30d2c2620976b82ad042feab Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 17 Feb 2021 15:14:32 +0100
Subject: [PATCH 7/7] FIRE-30763: Fix chat header layout

---
 indra/newview/fschathistory.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/indra/newview/fschathistory.cpp b/indra/newview/fschathistory.cpp
index 61bcf6b519..b154ac17ef 100644
--- a/indra/newview/fschathistory.cpp
+++ b/indra/newview/fschathistory.cpp
@@ -141,6 +141,7 @@ public:
 		mUserNameFont(NULL),
 		mUserNameTextBox(NULL),
 		mTimeBoxTextBox(NULL),
+		mHeaderLayoutStack(NULL),
 		mAvatarNameCacheConnection()
 	{}
 
@@ -577,6 +578,7 @@ public:
 
 		mUserNameTextBox = getChild<LLTextBox>("user_name");
 		mTimeBoxTextBox = getChild<LLTextBox>("time_box");
+		mHeaderLayoutStack = getChild<LLLayoutStack>("header_ls");
 
 		mInfoCtrl = LLUICtrlFactory::getInstance()->createFromFile<LLUICtrl>("inspector_info_ctrl.xml", this, LLPanel::child_registry_t::instance());
 		llassert(mInfoCtrl != NULL);
@@ -1063,8 +1065,10 @@ private:
 		mTimeBoxTextBox->translate(delta_pos_x, delta_pos_y);
 
 		//... & change width of the name control
-		const LLRect& user_rect = mUserNameTextBox->getRect();
-		mUserNameTextBox->reshape(user_rect.getWidth() + delta_pos_x, user_rect.getHeight());
+		//const LLRect& user_rect = mUserNameTextBox->getRect();
+		//mUserNameTextBox->reshape(user_rect.getWidth() + delta_pos_x, user_rect.getHeight());
+		const LLRect& layoutstack_rect = mHeaderLayoutStack->getRect();
+		mHeaderLayoutStack->reshape(layoutstack_rect.getWidth() + delta_pos_x, layoutstack_rect.getHeight());
 	}
 
 	void fetchAvatarName()
@@ -1127,6 +1131,7 @@ protected:
 	const LLFontGL*		mUserNameFont;
 	LLTextBox*			mUserNameTextBox;
 	LLTextBox*			mTimeBoxTextBox;
+	LLLayoutStack*		mHeaderLayoutStack;
 
 	LLStyle::Params		mNameStyleParams;