From 98d4bc6e942492462ef05c7d29c20276e939dd0f Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 22 Oct 2012 17:08:59 +0200
Subject: [PATCH] FIRE-1583: Exposed RenderNameShowTime debug setting in
 preferences, General to set how long nametags should be shown

---
 .../xui/de/panel_preferences_general.xml      |  6 +++
 .../xui/en/panel_preferences_general.xml      | 38 +++++++++++++++++++
 .../xui/es/panel_preferences_general.xml      |  6 +++
 .../xui/fr/panel_preferences_general.xml      |  6 +++
 .../xui/it/panel_preferences_general.xml      |  6 +++
 .../xui/pl/panel_preferences_general.xml      |  6 +++
 .../xui/ru/panel_preferences_general.xml      |  6 +++
 .../xui/zh/panel_preferences_general.xml      |  6 +++
 8 files changed, 80 insertions(+)

diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
index 0ab73cdb1f..c869317d08 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
@@ -46,6 +46,12 @@
 		<radio_item label="An" name="radio2" width="87"/>
 		<radio_item label="Kurz anzeigen" name="radio3" width="87"/>
 	</radio_group>
+	<text left_pad="0" name="RenderNameShowTime_LabelPrefix">
+		(
+	</text>
+	<text name="RenderNameShowTime_LabelSuffix">
+		Sekunden)
+	</text>
 	<check_box label="Mein Name" name="show_my_name_checkbox1"/>
 	<check_box label="Benutzernamen" name="show_slids" tool_tip="Benutzernamen wie berndschmidt123 anzeigen" left_pad="75"/>
 	<check_box label="Gruppentitel" name="show_all_title_checkbox1" tool_tip="Gruppentitel wie „Vorstand“ oder „Mitglied“"/>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index fa2d46f051..667690e10c 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -269,6 +269,44 @@
          value="2"
          width="160" />
     </radio_group>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="15"
+     layout="topleft"
+     left_pad="-25"
+     name="RenderNameShowTime_LabelPrefix"
+     top_delta="0"
+     width="5">
+       (
+    </text>
+    <spinner
+     allow_text_entry="true"
+     control_name="RenderNameShowTime"
+     decimal_digits="0"
+     follows="left|top"
+     height="20"
+     increment="1"
+     layout="topleft"
+     left_pad="0"
+     max_val="60"
+     min_val="1"
+     name="RenderNameShowTime"
+     top_delta="-4"
+     width="40"/>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="15"
+     layout="topleft"
+     left_pad="3"
+     name="RenderNameShowTime_LabelSuffix"
+     top_delta="4"
+     width="80">
+       seconds)
+    </text>
     <check_box
      enabled_control="AvatarNameTagMode"
      control_name="RenderNameShowSelf"
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
index 431bbcab43..bac0dd1df6 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
@@ -45,6 +45,12 @@
 		<radio_item label="Mostrar" name="radio2"/>
 		<radio_item label="Mostrar brevemente" name="radio3"/>
 	</radio_group>
+	<text left_pad="35" name="RenderNameShowTime_LabelPrefix">
+		(
+	</text>
+	<text name="RenderNameShowTime_LabelSuffix">
+		seconds)
+	</text>
 	<check_box label="Mi nombre" name="show_my_name_checkbox1"/>
 	<check_box label="Nombre de usuario" name="show_slids" tool_tip="Mostrar el nombre de usuario, como bobsmith123"/>
 	<check_box label="Títulos de grupos" name="show_all_title_checkbox1" tool_tip="Mostrar títulos de grupos, como Jefe o Miembro"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
index fe934be4a5..440d1832c9 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
@@ -46,6 +46,12 @@
 		<radio_item label="Activé" name="radio2"/>
 		<radio_item label="Afficher brièvement" name="radio3"/>
 	</radio_group>
+	<text left_pad="5" name="RenderNameShowTime_LabelPrefix">
+		(
+	</text>
+	<text name="RenderNameShowTime_LabelSuffix">
+		seconds)
+	</text>
 	<check_box label="Mon nom" name="show_my_name_checkbox1"/>
 	<check_box label="Noms d&apos;utilisateur" name="show_slids" tool_tip="Afficher le nom d&apos;utilisateur, comme bobsmith123."/>
 	<check_box label="Titres de groupe" name="show_all_title_checkbox1" tool_tip="Afficher les titres de groupe, comme Officier ou Membre."/>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_general.xml b/indra/newview/skins/default/xui/it/panel_preferences_general.xml
index 7223c052b5..732322ece1 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_general.xml
@@ -46,6 +46,12 @@
 		<radio_item label="On" name="radio2"/>
 		<radio_item label="Mostra brevemente" name="radio3"/>
 	</radio_group>
+	<text left_pad="5" name="RenderNameShowTime_LabelPrefix">
+		(
+	</text>
+	<text name="RenderNameShowTime_LabelSuffix">
+		seconds)
+	</text>
 	<check_box label="Il mio nome" name="show_my_name_checkbox1"/>
 	<check_box label="Nomi utente" name="show_slids" tool_tip="Mostra il nome utente, come bobsmith123"/>
 	<check_box label="Titoli gruppo" name="show_all_title_checkbox1" tool_tip="Mostra titoli di gruppo, come Funzionario o Membro"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
index 9352ebcff9..fb1b4ecb58 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
@@ -45,6 +45,12 @@
 		<radio_item label="Włącz" name="radio2"/>
 		<radio_item label="Pokaż na chwilę" name="radio3"/>
 	</radio_group>
+	<text left_pad="-20" name="RenderNameShowTime_LabelPrefix">
+		(
+	</text>
+	<text name="RenderNameShowTime_LabelSuffix">
+		seconds)
+	</text>
 	<check_box label="Pokaż moje imię" name="show_my_name_checkbox1"/>
 	<check_box label="Nazwy użytkowników" name="show_slids" tool_tip="Pokaż nazwy kont użytkowników, np. bobsmith123"/>
 	<check_box label="Pokaż tytuły grupowe" name="show_all_title_checkbox1" tool_tip="Wyświetl tytuł grupowy np. Oficer"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_general.xml b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
index 005cffca80..56daae466a 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
@@ -44,6 +44,12 @@
 		<radio_item label="Вкл." name="radio2"/>
 		<radio_item label="Временный показ" name="radio3"/>
 	</radio_group>
+	<text left_pad="0" name="RenderNameShowTime_LabelPrefix">
+		(
+	</text>
+	<text name="RenderNameShowTime_LabelSuffix">
+		seconds)
+	</text>
 	<check_box label="Мое имя" name="show_my_name_checkbox1"/>
 	<check_box label="Имена пользователей" name="show_slids" tool_tip="Показывать имя пользователя, например, bobsmith123"/>
 	<check_box label="Титулы групп" name="show_all_title_checkbox1" tool_tip="Показывать титулы групп, например, Officer или Member"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
index 2d4b02a034..e49341e93b 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
@@ -42,6 +42,12 @@
 		<radio_item label="On" name="radio2"/>
 		<radio_item label="簡短顯示" name="radio3"/>
 	</radio_group>
+	<text left_pad="-55" name="RenderNameShowTime_LabelPrefix">
+		(
+	</text>
+	<text name="RenderNameShowTime_LabelSuffix">
+		seconds)
+	</text>
 	<check_box label="我的名字" name="show_my_name_checkbox1"/>
 	<check_box label="使用者名稱" name="show_slids" tool_tip="顯示使用者名稱，就像 bobsmith123 這類的"/>
 	<check_box label="群組頭銜" name="show_all_title_checkbox1" tool_tip="顯示群組頭銜，像是 Officer 或成員"/>