From 1de6d4461a3dfaa7dc0f474e2270683b30b6c652 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Liru=20F=C3=A6rs?= <lirusaito@gmail.com>
Date: Fri, 3 Apr 2020 02:53:41 -0400
Subject: [PATCH] Add missing EmergencyTeleportSeconds preference to
 System->Security

Thanks for the heads up about this missing preferences, and for the
Spanish translation, Damian!
---
 indra/newview/ascentprefssys.cpp                             | 2 ++
 indra/newview/ascentprefssys.h                               | 1 +
 .../default/xui/en-us/panel_preferences_ascent_system.xml    | 5 +++--
 .../skins/default/xui/es/panel_preferences_ascent_system.xml | 3 ++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/indra/newview/ascentprefssys.cpp b/indra/newview/ascentprefssys.cpp
index 5c8ddc9e9..2b530ad72 100644
--- a/indra/newview/ascentprefssys.cpp
+++ b/indra/newview/ascentprefssys.cpp
@@ -207,6 +207,7 @@ void LLPrefsAscentSys::refreshValues()
     mDisplayScriptJumps			= gSavedSettings.getBOOL("AscentDisplayTotalScriptJumps");
     mNumScriptDiff              = gSavedSettings.getF32("Ascentnumscriptdiff");
 	mReplaceLinks				= gSavedSettings.getBOOL("SinguReplaceLinks");
+	mEmergencySeconds           = gSavedPerAccountSettings.getU32("EmergencyTeleportSeconds");
 	mLandmark			= gSavedPerAccountSettings.getString("EmergencyTeleportLandmark");
 	mLandmarkBackup			= gSavedPerAccountSettings.getString("EmergencyTeleportLandmarkBackup");
 
@@ -353,6 +354,7 @@ void LLPrefsAscentSys::cancel()
     gSavedSettings.setBOOL("AscentDisplayTotalScriptJumps", mDisplayScriptJumps);
     gSavedSettings.setF32("Ascentnumscriptdiff",            mNumScriptDiff);
 	gSavedSettings.setBOOL("SinguReplaceLinks",             mReplaceLinks);
+	gSavedPerAccountSettings.setU32("EmergencyTeleportSeconds", mEmergencySeconds);
 	gSavedPerAccountSettings.setString("EmergencyTeleportLandmark",      mLandmark);
 	gSavedPerAccountSettings.setString("EmergencyTeleportLandmarkBackup",      mLandmarkBackup);
 
diff --git a/indra/newview/ascentprefssys.h b/indra/newview/ascentprefssys.h
index 187212b38..1c357750e 100644
--- a/indra/newview/ascentprefssys.h
+++ b/indra/newview/ascentprefssys.h
@@ -118,6 +118,7 @@ private:
 	bool mDisplayScriptJumps;
 	bool mReplaceLinks;
 	F32 mNumScriptDiff;
+	U32 mEmergencySeconds;
 	std::string mLandmark;
 	std::string mLandmarkBackup;
 
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
index 4d3b11bb4..00905cde2 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
@@ -115,8 +115,9 @@
       <spinner bottom_delta="0" decimal_digits="0" follows="top" height="16" increment="1" left_delta="210" max_val="9999" min_val="1" name="ScriptJumpCount" width="50" control_name="Ascentnumscriptdiff" tool_tip="Threshold for the script jump message [Default: 100]"/>
       <check_box bottom_delta="-20" left="10" follows="top" label="Restrained Love API Support (RLVa)" name="RestrainedLove" control_name="RestrainedLove" tool_tip="Allows scripts to take greater control of the viewer, if you wear compliant objects."/>
       <check_box bottom_delta="-20" follows="top" label="Replace slurls and formatted links with labels" name="SinguReplaceLinks" control_name="SinguReplaceLinks" tool_tip="While you can right click to see where they really lead by copying them, this does allow links to be misleading at first glance."/>
-      <text name="EmergencyTeleportDesc" left="14" bottom_delta="-12" follows="top">Drop a landmark below to autoteleport there in the last 20 seconds before region restarts</text>
-      <drop_target control_name="EmergencyTeleportLandmark" bottom_delta="-8" left="15" height="17" name="emergency_teleport_landmark_drop" width="430"/>
+      <text name="EmergencyTeleportDesc" left="14" bottom_delta="-12" follows="top">Drop a landmark below to autoteleport to before region restarts</text>
+      <spinner name="EmergencyTeleportSeconds" label="Seconds before restart to begin teleport attempts" label_width="380" width="432" control_name="EmergencyTeleportSeconds" bottom_delta="-26" decimal_digits="0" max_val="3600" min_val="0" follows="left|top" height="18" increment="1"/>
+      <drop_target control_name="EmergencyTeleportLandmark" bottom_delta="-4" left="15" height="17" name="emergency_teleport_landmark_drop" width="430"/>
       <text name="EmergencyTeleportBackupDesc" halign="center" width="432" left="14" bottom_delta="-26" follows="top">Drop a backup landmark to autoteleport to below, should you already be at above</text>
       <drop_target control_name="EmergencyTeleportLandmarkBackup" bottom_delta="-8" left="15" height="17" name="emergency_teleport_landmark_backup_drop" width="430"/>
     </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml
index 044b11695..7f1a5f58c 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml
@@ -135,7 +135,8 @@
 			<spinner left_delta="270" name="ScriptJumpCount" tool_tip="Umbral para el mensaje de salto de scripts [Predeterminado: 100]"/>
 			<check_box label="Soporte API Restrained Love (RLVa)" name="RestrainedLove" tool_tip="Permite a los scripts tomar control del visor, si tienes vestido un objeto compatible con RLVa."/>
 			<check_box label="Reemplazar slurls y enlaces con etiquetas" name="SinguReplaceLinks"  tool_tip="Si bien puedes hacer clic con el botón derecho para ver a dónde conducen realmente al copiarlos, esto puede hacer que los enlaces sean confusos a primera vista."/>
-			<text name="EmergencyTeleportDesc" bottom_delta="-20" >Arrastra un hito para autoteleportarte en los últimos 20 segundos previos al reinicio de región</text>
+			<text name="EmergencyTeleportDesc" bottom_delta="-20" >Arrastra un hito debajo para autoteleportarte antes del reinicio de la región</text>
+			<spinner name="EmergencyTeleportSeconds" label="Comenzar intentos de teleporte antes del reinicio, en segundos"/>
 			<drop_target name="emergency_teleport_landmark_drop" bottom_delta="-15" width="450"/>
 			<text name="EmergencyTeleportBackupDesc" width="440" bottom_delta="-30" >
 				Suelta aquí un hito de resguardo para autoteleportarte, si ya tienes uno en el ítem anterior</text>