diff options
| author | Vir Linden <vir@lindenlab.com> | 2021-10-25 15:55:31 +0000 |
|---|---|---|
| committer | Vir Linden <vir@lindenlab.com> | 2021-10-25 15:55:31 +0000 |
| commit | c173b07b72ac3e30c019cbee8dba53401c781be3 (patch) | |
| tree | 6267b828141028889894be919263c6d19c6e54c1 /indra/newview/app_settings | |
| parent | 3efd4c50a031ce0c1cb3d2fcc43e403136277e1f (diff) | |
| parent | ba3459f77fc9b93c8dd79bc3ac7c59ba792da27f (diff) | |
Merged in SL-15999 (pull request #746)
SL-15999 support --noninteractive option for viewer
Approved-by: Dave Parks
Approved-by: Michael Pohoreski
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/cmd_line.xml | 8 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 22 |
2 files changed, 30 insertions, 0 deletions
diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index 4e186292f7..7514913d13 100644 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -217,6 +217,14 @@ <string>NoInventoryLibrary</string> </map> + <key>noninteractive</key> + <map> + <key>desc</key> + <string>Run in semi-headless mode where only login and logout need to work.</string> + <key>map-to</key> + <string>NonInteractive</string> + </map> + <key>nonotifications</key> <map> <key>desc</key> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index eeadea76a2..aeeba58a68 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -7015,6 +7015,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>NonInteractive</key> + <map> + <key>Comment</key> + <string>Run in a semi-headless mode where only logging in and logging out needs to work.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>NonvisibleObjectsInMemoryTime</key> <map> <key>Comment</key> @@ -16644,6 +16655,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>UpdateAppWindowTitleBar</key> + <map> + <key>Comment</key> + <string>Updates the application window title bar with brief information about user/location</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> </map> </llsd> |