diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-16 21:24:21 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-16 21:24:21 -0400 |
| commit | 25b69823e6a29e21310ada2961dd4bbe08756f55 (patch) | |
| tree | 5b0b5970f1d3510afff41dc9448444dfaed19e3c /indra/newview/app_settings/cmd_line.xml | |
| parent | 65bdb537531141bcfb00163888540624a600a17b (diff) | |
| parent | 31edad0a226a14b5b87fe364c629f8450bda567c (diff) | |
merge changes for storm-1064
Diffstat (limited to 'indra/newview/app_settings/cmd_line.xml')
| -rw-r--r-- | indra/newview/app_settings/cmd_line.xml | 18 |
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> |