From d5febe1ab553749808198ec4e0c78ec64d4d9588 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 27 Jun 2013 11:07:12 -0400 Subject: CHOP-956: Add settings_install.xml to settings_files.xml. Also clarify comment for ELLPath in lldir.h: ELLPath int values are read from settings_files.xml. --- indra/newview/app_settings/settings_files.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings_files.xml b/indra/newview/app_settings/settings_files.xml index bfc09286e3..4a9e522a96 100755 --- a/indra/newview/app_settings/settings_files.xml +++ b/indra/newview/app_settings/settings_files.xml @@ -4,6 +4,9 @@ + -- cgit v1.2.3 From 4a9b688b4d46f67e1b00e04ebe972470b61e560a Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 27 Jun 2013 16:11:48 -0400 Subject: CHOP-959: Make settings.xml actually valid XML LLSD. UserLoginInfo block had Value without the required subsequent element to provide any actual value. This confused at least the Python LLSD reader. --- indra/newview/app_settings/settings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 12ca902c59..997bde37ce 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12859,12 +12859,13 @@ UserLoginInfo Comment - Users loging data. + User login data. Persist 1 Type LLSD Value + VFSOldSize -- cgit v1.2.3 From c08b60ac6fee74f613ed3f5f8702291ed1c2376f Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 28 Jun 2013 15:26:18 -0400 Subject: CHOP-959: Streamline processing for --graphicslevel switch. Use map-to in cmd_line.xml to inform the command-line processor that the target variable for --graphicslevel is RenderQualityPerformance. That lets us eliminate clunky llappviewer.cpp switch from '0' to 0, etc. Moreover, previous switch statement only accepted 0 - 3, whereas LLFeatureManager::setGraphicsLevel() actually accepts 0 - 6. Introduce LLFeatureManager::isValidGraphicsLevel() and use that to validate. Replace switch statement in setGraphicsLevel() mapping int constants to string literals with static vector of level names, using same data for mapping as for validating level numbers. --- indra/newview/app_settings/cmd_line.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index 7ab7787d77..8ca33fbf54 100755 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -96,6 +96,8 @@ 0 - low, 1 - medium, 2 - high, 3 - ultra count 1 + map-to + RenderQualityPerformance grid -- cgit v1.2.3 From 3d9c74dcc869d7ce3708426a0b45bfb838529d3f Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 1 Jul 2013 16:19:24 -0400 Subject: CHOP-959: Introduce and use settings vars for some cmd_line switches. The cmd_line.xml entries: analyzeperformance crashonstartup debugsession disablecrashlogger logmetrics logperformance noquicktime replaysession all specify map-to settings.xml variables -- none of which existed! Introduce such variables. Instead of detecting the presence of a particular switch in the command-line parser, use the value of its corresponding settings variable. --- indra/newview/app_settings/settings.xml | 88 +++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 997bde37ce..a39b447cca 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -126,6 +126,17 @@ Value 1 + AnalyzePerformance + + Comment + Request performance analysis for a particular viewer run + Persist + 0 + Type + Boolean + Value + 0 + AnimateTextures Comment @@ -1916,6 +1927,17 @@ Value 262144 + CrashOnStartup + + Comment + User-requested crash on viewer startup + Persist + 0 + Type + Boolean + Value + 0 + CreateToolCopyCenters Comment @@ -2158,6 +2180,17 @@ Value 0 + DebugSession + + Comment + Request debugging for a particular viewer session + Persist + 0 + Type + Boolean + Value + 0 + DebugShowColor Comment @@ -2972,6 +3005,17 @@ Value 0 + DisableCrashLogger + + Comment + Do not send crash report to Linden server + Persist + 0 + Type + Boolean + Value + 0 + DisableMouseWarp Comment @@ -5217,6 +5261,28 @@ Value 0 + LogMetrics + + Comment + Log viewer metrics + Persist + 0 + Type + String + Value + + + LogPerformance + + Comment + Log performance analysis for a particular viewer run + Persist + 0 + Type + Boolean + Value + 0 + LogTextureNetworkTraffic Comment @@ -6394,6 +6460,17 @@ Value 0 + NoQuickTime + + Comment + Disable QuickTime for a particular viewer run + Persist + 0 + Type + Boolean + Value + 0 + NoVerifySSLCert Comment @@ -9643,6 +9720,17 @@ Value 1 + ReplaySession + + Comment + Request replay of previously-recorded pilot file + Persist + 0 + Type + Boolean + Value + 0 + RotateRight Comment -- cgit v1.2.3 From 09d8d17382c72b7741fde1334e832f39d773299f Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 2 Jul 2013 15:30:49 -0400 Subject: CHOP-959: Introduce CmdLineLoginLocation var for --url and --slurl. Route --url and --slurl command-line switches through a common settings variable. Treat them uniformly now. (Previously, passing --url would notice a grid-specific SLURL and preselect that grid; --slurl wouldn't. Now both do.) --- indra/newview/app_settings/cmd_line.xml | 6 ++++-- indra/newview/app_settings/settings.xml | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index 8ca33fbf54..71a052057c 100755 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -372,7 +372,8 @@ true last_option true - + map-to + CmdLineLoginLocation url @@ -383,7 +384,8 @@ 1 last_option true - + map-to + CmdLineLoginLocation usersessionsettings diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a39b447cca..8a50ca146b 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1795,6 +1795,17 @@ + CmdLineLoginLocation + + Comment + Startup destination requested on command line + Persist + 0 + Type + String + Value + + ConnectAsGod Comment -- cgit v1.2.3 From d8565b05a5ccc9df8522db1d0fb32c320fa975b9 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 2 Jul 2013 16:33:40 -0400 Subject: CHOP-959: Introduce CmdLineChannel settings var, map --channel to it. --- indra/newview/app_settings/cmd_line.xml | 3 ++- indra/newview/app_settings/settings.xml | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index 71a052057c..74117dbd85 100755 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -22,7 +22,8 @@ count 1 - + map-to + CmdLineChannel console diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8a50ca146b..6f50a72016 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1749,6 +1749,17 @@ Value 0 + CmdLineChannel + + Comment + Command line specified channel name + Persist + 0 + Type + String + Value + + CmdLineDisableVoice Comment -- cgit v1.2.3