summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/cmd_line.xml
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-02-22 19:30:50 -0800
committerRichard Linden <none@none>2011-02-22 19:30:50 -0800
commit5aa43e4f3e30d81fb518783189b3258e67b4620a (patch)
tree4901a303d41e99052e99a31c5874c2318d7697c8 /indra/newview/app_settings/cmd_line.xml
parent3968bf45a6a39fb1a2e9dc340984b1bb01af9615 (diff)
SOCIAL-545 WIP Figure out how to configure skylight-specific settings while retaining relevant user settings (login account name, etc.)
converted settings_file.xml to use param block descriptions for easier modification added session settings file and user session settings file for per-session config overrides
Diffstat (limited to 'indra/newview/app_settings/cmd_line.xml')
-rw-r--r--indra/newview/app_settings/cmd_line.xml18
1 files changed, 18 insertions, 0 deletions
diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml
index e4ac455e7c..89e5949fbe 100644
--- a/indra/newview/app_settings/cmd_line.xml
+++ b/indra/newview/app_settings/cmd_line.xml
@@ -261,6 +261,24 @@
<!-- Special case. Mapped to settings procedurally. -->
</map>
+ <key>sessionsettings</key>
+ <map>
+ <key>desc</key>
+ <string>Specify the filename of a configuration file that contains temporary per-session configuration overrides.</string>
+ <key>count</key>
+ <integer>1</integer>
+ <!-- Special case. Mapped to settings procedurally. -->
+ </map>
+
+ <key>usersessionsettings</key>
+ <map>
+ <key>desc</key>
+ <string>Specify the filename of a configuration file that contains temporary per-session configuration user overrides.</string>
+ <key>count</key>
+ <integer>1</integer>
+ <!-- Special case. Mapped to settings procedurally. -->
+ </map>
+
<key>login</key>
<map>
<key>desc</key>