From c419c4d5605e65b797d9cf6ee560c3c655ca643d Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Wed, 16 Jan 2019 13:03:58 -0500 Subject: [PATCH] Add UI for the replacing of urls to System->Security at the bottom Moves the region restart preferences into Vanity->main --- indra/newview/ascentprefssys.cpp | 9 ++------- indra/newview/ascentprefssys.h | 3 +-- indra/newview/ascentprefsvan.cpp | 7 +++++++ indra/newview/ascentprefsvan.h | 2 ++ .../xui/en-us/panel_preferences_ascent_system.xml | 4 +--- .../xui/en-us/panel_preferences_ascent_vanity.xml | 3 +++ .../default/xui/es/panel_preferences_ascent_system.xml | 5 ----- .../default/xui/es/panel_preferences_ascent_vanity.xml | 5 +++++ .../default/xui/fr/panel_preferences_ascent_system.xml | 2 -- .../default/xui/fr/panel_preferences_ascent_vanity.xml | 2 ++ 10 files changed, 23 insertions(+), 19 deletions(-) diff --git a/indra/newview/ascentprefssys.cpp b/indra/newview/ascentprefssys.cpp index a2c577d0d..5c8ddc9e9 100644 --- a/indra/newview/ascentprefssys.cpp +++ b/indra/newview/ascentprefssys.cpp @@ -77,7 +77,6 @@ LLPrefsAscentSys::LLPrefsAscentSys() getChild("AlchemyChatCommandHoverHeight")->setCommitCallback(lineEditorControl); //Security ---------------------------------------------------------------------------- - getChild("UISndRestart")->setCommitCallback(lineEditorControl); //Build ------------------------------------------------------------------------------- getChild("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("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); diff --git a/indra/newview/ascentprefssys.h b/indra/newview/ascentprefssys.h index ae7a07cab..187212b38 100644 --- a/indra/newview/ascentprefssys.h +++ b/indra/newview/ascentprefssys.h @@ -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; diff --git a/indra/newview/ascentprefsvan.cpp b/indra/newview/ascentprefsvan.cpp index 6a51b580f..aaa1130b0 100644 --- a/indra/newview/ascentprefsvan.cpp +++ b/indra/newview/ascentprefsvan.cpp @@ -62,6 +62,8 @@ LLPrefsAscentVan::LLPrefsAscentVan() getChild("tag_spoofing_combobox")->setCommitCallback(boost::bind(&LLPrefsAscentVan::onCommitClientTag, this, _1)); getChild("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("UISndRestart")->setCommitCallback(lineEditorControl); getChild("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("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); diff --git a/indra/newview/ascentprefsvan.h b/indra/newview/ascentprefsvan.h index b45adf652..676042c13 100644 --- a/indra/newview/ascentprefsvan.h +++ b/indra/newview/ascentprefsvan.h @@ -66,6 +66,8 @@ private: bool mCompleteNameProfiles; bool mScriptErrorsStealFocus; bool mConnectToNeighbors; + bool mRestartMinimized; + std::string mRestartSound; //Tags\Colors bool mAscentBroadcastTag; std::string mReportClientUUID; 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 84c37dd54..abdee1a6c 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 @@ -114,13 +114,11 @@ - + Drop a landmark below to autoteleport there in the last 20 seconds before region restarts Drop a backup landmark to autoteleport to below, should you already be at the above - Sound played when regions will restart: - diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml index d1ca9be5e..52827e6b0 100644 --- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml +++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml @@ -16,6 +16,9 @@ + + Sound played when regions will restart: + 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 8ba0ddbc3..8c006e8f6 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 @@ -134,16 +134,11 @@ - Arrastra un hito para autoteleportarte en los últimos 20 segundos previos al reinicio de región Suelta aquí un hito de resguardo para autoteleportarte, si ya tienes uno en el ítem anterior - - Ejecutar sonido cuando la región esté por reiniciarse: - - diff --git a/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml b/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml index 736e45e4e..66bd3e005 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml @@ -16,6 +16,11 @@ + + + Ejecutar sonido cuando la región esté por reiniciarse: + + diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml index 6a4061171..cb60efdca 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml @@ -89,10 +89,8 @@ - Glissez un landmark ci dessous pour y être téléporté 20 sec avant le redémarrage de la sim Glissez ci dessous un second landmark de 'secours' - Alerte sonore du redémarrage: diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_ascent_vanity.xml b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_vanity.xml index 7393b388b..6bc3cf598 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_ascent_vanity.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_vanity.xml @@ -16,6 +16,8 @@ + + Alerte sonore du redémarrage: