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);