Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add UI for the replacing of urls to System->Security at the bottom

Browse Source 
Moves the region restart preferences into Vanity->main
This commit is contained in:
Lirusaito
2019-01-16 13:03:58 -05:00
parent 269576805b
commit c419c4d560
10 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/ascentprefssys.cpp
View File

@@ -77,7 +77,6 @@ LLPrefsAscentSys::LLPrefsAscentSys()
getChild<LLUICtrl>("AlchemyChatCommandHoverHeight")->setCommitCallback(lineEditorControl);
//Security ----------------------------------------------------------------------------
getChild<LLUICtrl>("UISndRestart")->setCommitCallback(lineEditorControl);
//Build -------------------------------------------------------------------------------
getChild<LLUICtrl>("next_owner_copy")->setCommitCallback(boost::bind(&LLPrefsAscentSys::onCommitCheckBox, this, _1, _2));
@@ -207,8 +206,7 @@ void LLPrefsAscentSys::refreshValues()
mDisableClickSitOtherOwner = gSavedSettings.getBOOL("DisableClickSitOtherOwner");
mDisplayScriptJumps = gSavedSettings.getBOOL("AscentDisplayTotalScriptJumps");
mNumScriptDiff = gSavedSettings.getF32("Ascentnumscriptdiff");
mRestartMinimized = gSavedSettings.getBOOL("LiruRegionRestartMinimized");
mRestartSound = gSavedSettings.getString("UISndRestart");
mReplaceLinks = gSavedSettings.getBOOL("SinguReplaceLinks");
mLandmark = gSavedPerAccountSettings.getString("EmergencyTeleportLandmark");
mLandmarkBackup = gSavedPerAccountSettings.getString("EmergencyTeleportLandmarkBackup");
@@ -266,8 +264,6 @@ void LLPrefsAscentSys::refresh()
childSetValue("AlchemyChatCommandHoverHeight", mCmdLineHover);
//Security ----------------------------------------------------------------------------
getChildView("UISndRestart")->setValue(mRestartSound);
if (LLComboBox* combo = getChild<LLComboBox>("lookat_namesystem_combobox"))
combo->setValue(mLookAtNames);
@@ -356,8 +352,7 @@ void LLPrefsAscentSys::cancel()
gSavedSettings.setBOOL("DisableClickSitOtherOwner", mDisableClickSitOtherOwner);
gSavedSettings.setBOOL("AscentDisplayTotalScriptJumps", mDisplayScriptJumps);
gSavedSettings.setF32("Ascentnumscriptdiff", mNumScriptDiff);
gSavedSettings.setBOOL("LiruRegionRestartMinimized", mRestartMinimized);
gSavedSettings.setString("UISndRestart", mRestartSound);
gSavedSettings.setBOOL("SinguReplaceLinks", mReplaceLinks);
gSavedPerAccountSettings.setString("EmergencyTeleportLandmark", mLandmark);
gSavedPerAccountSettings.setString("EmergencyTeleportLandmarkBackup", mLandmarkBackup);

3
indra/newview/ascentprefssys.h
View File

@@ -116,9 +116,8 @@ private:
bool mDisableClickSit;
bool mDisableClickSitOtherOwner;
bool mDisplayScriptJumps;
bool mRestartMinimized;
bool mReplaceLinks;
F32 mNumScriptDiff;
std::string mRestartSound;
std::string mLandmark;
std::string mLandmarkBackup;

7
indra/newview/ascentprefsvan.cpp
View File

@@ -62,6 +62,8 @@ LLPrefsAscentVan::LLPrefsAscentVan()
getChild<LLUICtrl>("tag_spoofing_combobox")->setCommitCallback(boost::bind(&LLPrefsAscentVan::onCommitClientTag, this, _1));
getChild<LLUICtrl>("custom_tag_label_box")->setCommitCallback(boost::bind(&LLControlGroup::setString, boost::ref(gSavedSettings), "AscentCustomTagLabel", _2));
commit_callback_t lineEditorControl(boost::bind(&LLControlGroup::setString, boost::ref(gSavedSettings), boost::bind(&LLUICtrl::getName, _1), _2));
getChild<LLUICtrl>("UISndRestart")->setCommitCallback(lineEditorControl);
getChild<LLUICtrl>("update_clientdefs")->setCommitCallback(boost::bind(LLPrefsAscentVan::onManualClientUpdate));
@@ -130,6 +132,8 @@ void LLPrefsAscentVan::refreshValues()
mCompleteNameProfiles = gSavedSettings.getBOOL("SinguCompleteNameProfiles");
mScriptErrorsStealFocus = gSavedSettings.getBOOL("LiruScriptErrorsStealFocus");
mConnectToNeighbors = gSavedSettings.getBOOL("AlchemyConnectToNeighbors");
mRestartMinimized = gSavedSettings.getBOOL("LiruRegionRestartMinimized");
mRestartSound = gSavedSettings.getString("UISndRestart");
//Tags\Colors ----------------------------------------------------------------------------
mAscentBroadcastTag = gSavedSettings.getBOOL("AscentBroadcastTag");
@@ -169,6 +173,7 @@ void LLPrefsAscentVan::refreshValues()
void LLPrefsAscentVan::refresh()
{
//Main -----------------------------------------------------------------------------------
getChildView("UISndRestart")->setValue(mRestartSound);
//Tags\Colors ----------------------------------------------------------------------------
LLComboBox* combo = getChild<LLComboBox>("tag_spoofing_combobox");
@@ -201,6 +206,8 @@ void LLPrefsAscentVan::cancel()
gSavedSettings.setBOOL("SinguCompleteNameProfiles", mCompleteNameProfiles);
gSavedSettings.setBOOL("LiruScriptErrorsStealFocus", mScriptErrorsStealFocus);
gSavedSettings.setBOOL("AlchemyConnectToNeighbors", mConnectToNeighbors);
gSavedSettings.setBOOL("LiruRegionRestartMinimized", mRestartMinimized);
gSavedSettings.setString("UISndRestart", mRestartSound);
//Tags\Colors ----------------------------------------------------------------------------
gSavedSettings.setBOOL("AscentBroadcastTag", mAscentBroadcastTag);

2
indra/newview/ascentprefsvan.h
View File

@@ -66,6 +66,8 @@ private:
bool mCompleteNameProfiles;
bool mScriptErrorsStealFocus;
bool mConnectToNeighbors;
bool mRestartMinimized;
std::string mRestartSound;
//Tags\Colors
bool mAscentBroadcastTag;
std::string mReportClientUUID;

4
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
View File

@@ -114,13 +114,11 @@
<check_box bottom_delta="-20" left="10" follows="top" initial_value="false" label="Display Total Script Count changes:" name="totalscriptjumps" control_name="AscentDisplayTotalScriptJumps" tool_tip="Displays script count changes in your region, dependant on the threshold you choose to the right."/>
<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="Auto-minimize region restart notice" name="region_restart_minimized" control_name="LiruRegionRestartMinimized" tool_tip="Useful for sim owners and people who need to pack up before leaving"/>
<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="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 the above</text>
<drop_target control_name="EmergencyTeleportLandmarkBackup" bottom_delta="-8" left="15" height="17" name="emergency_teleport_landmark_backup_drop" width="430"/>
<text bottom_delta="-26" follows="top" name="UISndRestartText">Sound played when regions will restart:</text>
<line_editor bottom_delta="-6" left_delta="222" follows="top" width="209" height="16" name="UISndRestart" tool_tip="Empty for no sound to play"/>
</panel>
<panel border="true" left="1" bottom="-408" height="408" width="500" label="Building" name="Building">

3
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
View File

@@ -16,6 +16,9 @@
<check_box bottom_delta="-20" control_name="SinguCompleteNameProfiles" follows="top" height="16" label="Show complete names (display name and username) in profiles" tool_tip="Disregards the global name display settings, will not work if display names are switched off." name="complete_name_profiles"/>
<check_box bottom_delta="-20" control_name="LiruScriptErrorsStealFocus" follows="top" height="16" label="Let scripts steal focus when they can't compile due to errors" name="script_errors_steal_focus"/>
<check_box bottom_delta="-20" control_name="AlchemyConnectToNeighbors" follows="top" height="16" label="Connect to neighboring regions" name="connect_to_neighbors"/>
<check_box bottom_delta="-20" follows="top" label="Auto-minimize region restart notice" name="region_restart_minimized" control_name="LiruRegionRestartMinimized" tool_tip="Useful for sim owners and people who need to pack up before leaving"/>
<text bottom_delta="-16" follows="top" name="UISndRestartText">Sound played when regions will restart:</text>
<line_editor bottom_delta="-6" left_delta="222" follows="top" width="209" height="16" name="UISndRestart" tool_tip="Empty for no sound to play"/>
</panel>
<panel border="true" left="1" bottom="-190" height="180" width="500" label="Tags/Colors" name="TagsColors">
<!-- Client tag options -->

5
indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml
View File

@@ -134,16 +134,11 @@
<check_box label="Mostrar cambios del Total de Scripts en Ejecución:" name="totalscriptjumps" tool_tip="Muestra los cambios en la cuenta total de scritps en tu región, dependiendo del umbral que selecciones a la derecha."/>
<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="Minimizar automáticamente aviso de reinicio de región" name="region_restart_minimized" tool_tip="Útil para dueños de sim y personas que necesitan recoger sus cosas antes de salir"/>
<text name="EmergencyTeleportDesc" bottom_delta="-20" >Arrastra un hito para autoteleportarte en los últimos 20 segundos previos al reinicio de región</text>
<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>
<drop_target name="emergency_teleport_landmark_backup_drop"/>
<text name="UISndRestartText" bottom_delta="-36" >
Ejecutar sonido cuando la región esté por reiniciarse:
</text>
<line_editor name="UISndRestart" tool_tip="Dejar vacío para no ejecutar sonidos" left_delta="258" />
</panel>
<!-- =========================== -->
<panel label="Construcción" name="Building">

5
indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml
View File

@@ -16,6 +16,11 @@
<check_box label="Mostrar nombres completos (Nombres mostrados y nombres de usuario) en perfiles" tool_tip="Sin importar la configuración global del mostrado de nombres, no funcionará si los nombres mostrados están desactivados." name="complete_name_profiles"/>
<check_box label="Permitir a los scripts apropiarse del foco cuando no se puedan compilar debido a errores" name="script_errors_steal_focus"/>
<check_box label="Conectarse con regiones contiguas" name="connect_to_neighbors"/>
<check_box label="Minimizar automáticamente aviso de reinicio de región" name="region_restart_minimized" tool_tip="Útil para dueños de sim y personas que necesitan recoger sus cosas antes de salir"/>
<text name="UISndRestartText" bottom_delta="-36" >
Ejecutar sonido cuando la región esté por reiniciarse:
</text>
<line_editor name="UISndRestart" tool_tip="Dejar vacío para no ejecutar sonidos" left_delta="258" />
</panel>
<!-- ============================ -->
<panel label="Tags/Colores" name="TagsColors">

2
indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml
View File

@@ -89,10 +89,8 @@
<check_box label="Affiche les changements de d&#xE9;comptes de scripts de la r&#xE9;gion." name="totalscriptjumps" tool_tip="D&#xE9;pendant du seuil que vous choisissez dans la fen&#xEA;tre &#xE0; droite."/>
<spinner left_delta="350" name="ScriptJumpCount"/>
<check_box label="RLVa (Restrained Love API)" name="RestrainedLove" tool_tip="Active le RLVa"/>
<check_box label="Reduit automatiquement la notice de redémarrage de la sim" name="region_restart_minimized"/>
<text name="EmergencyTeleportDesc">Glissez un landmark ci dessous pour y être téléporté 20 sec avant le redémarrage de la sim</text>
<text name="EmergencyTeleportBackupDesc">Glissez ci dessous un second landmark de 'secours'</text>
<text name="UISndRestartText">Alerte sonore du redémarrage:</text>
</panel>
<panel label="Build/Cr&#xE9;ation" name="Building">

2
indra/newview/skins/default/xui/fr/panel_preferences_ascent_vanity.xml
View File

@@ -16,6 +16,8 @@
<check_box label="Montrer les noms complets : display + ancient names dans les profils" tool_tip="Ne fonctionnera pas si les display sont désactivés dans le menu général." name="complete_name_profiles"/>
<check_box label="Garder les scripts en premier plan quand ils ne peuvent pas être compilés suite a une erreur" name="script_errors_steal_focus"/>
<check_box label="Se connecter aux régions voisines" name="connect_to_neighbors"/>
<check_box label="Reduit automatiquement la notice de redémarrage de la sim" name="region_restart_minimized"/>
<text name="UISndRestartText">Alerte sonore du redémarrage:</text>
</panel>
<panel label="Tags/Couleurs" name="TagsColors">
<!-- Client tag options -->