diff options
| author | Don Kjer <don@lindenlab.com> | 2012-08-17 01:41:07 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-08-17 01:41:07 +0000 |
| commit | 7ac0d2b8a31174b3d8872ec8ed5ed64c3d0bc7ed (patch) | |
| tree | 71ee0b4b8ed4f0f1a90f3138604b9d074087c4ad /indra/newview/app_settings | |
| parent | 48b7eff75835058f144bbc27a5b2ef2997be2be4 (diff) | |
| parent | 7204593ec3f6fca63c32bcb8cdcf9c356165d24e (diff) | |
Merge viewer-development -> sunshine
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/cmd_line.xml | 2 | ||||
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index 711191128b..7ab7787d77 100644 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -357,7 +357,7 @@ <key>count</key> <integer>1</integer> <key>map-to</key> - <string>SkinFolder</string> + <string>SkinCurrent</string> </map> <key>slurl</key> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 53d0926224..32213a07a8 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5045,7 +5045,7 @@ <key>LoginLocation</key> <map> <key>Comment</key> - <string>Login location ('last', 'home')</string> + <string>Default Login location ('last', 'home') preference</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -6145,7 +6145,7 @@ <key>NextLoginLocation</key> <map> <key>Comment</key> - <string>Location to log into by default.</string> + <string>Location to log into for this session - set from command line or the login panel, cleared following a successfull login.</string> <key>Persist</key> <integer>1</integer> <key>Type</key> |