diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-11-05 09:27:10 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-05 09:27:10 -0800 |
commit | 270629a3fe453e75c0ffeb780419ad3e27eeaa34 (patch) | |
tree | 5bb2f6f3e6871bc0285ed5b34a0166fd25074d68 /indra/newview/app_settings/settings.xml | |
parent | a0bbe8d8eb98aaba1dc55c7cbcb70d58125781ce (diff) | |
parent | 6f6d1314e6f1fe12391391172bffa52c9c08e380 (diff) |
merge from remote repo
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a286d321ee..1fc6a180d4 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5569,6 +5569,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>RegInClient</key> + <map> + <key>Comment</key> + <string>Experimental: Embed registration in login screen</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>RegionTextureSize</key> <map> <key>Comment</key> |