summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorangela <angela@lindenlab.com>2009-11-04 11:44:32 +0800
committerangela <angela@lindenlab.com>2009-11-04 11:44:32 +0800
commit1190b5d9eb6f1e1d698430957b99872abd354f81 (patch)
tree82915d4b684aaa4cae2d61ebc46a678fcf018c48 /indra/newview/app_settings/settings.xml
parentb4af6c3da8e5ef3e897cedfb2e1d677a3f37abe9 (diff)
parent3e3ef5c53d2e73c0836ef6056d222c4c35b8ac2d (diff)
merge
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 768fdd4103..7254fff664 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5558,6 +5558,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>