summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-08-23 15:11:10 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-08-23 15:11:10 -0700
commit6d84272d38a4d09819ae03f4d967195ec3bd660b (patch)
treef020454f9144a769081e44ee7cd4acae7042394b /indra/newview/app_settings
parentff95dd4a43fd888a9b7353abcbfa701e4844a3a5 (diff)
parentfcfc686d9c4125c7bf35fcc97cb40b18dd9a4fc1 (diff)
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 47e944bc26..61bc58b1df 100644
--- 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>