summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-11-03 12:24:51 -0800
committerJames Cook <james@lindenlab.com>2009-11-03 12:24:51 -0800
commit6ec038c0cad54f36d89678df63ae7526f5fb5bca (patch)
tree5dac3420eb2e4988011a46709ae671572e6b083b /indra/newview/app_settings
parente87975284e2b50c81d95bbb9672678ae262288be (diff)
parentf75ce16477af31c2df1d79bcb492ae43c3b380e8 (diff)
merge
Diffstat (limited to 'indra/newview/app_settings')
-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>