diff options
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 23 | ||||
| -rwxr-xr-x | indra/newview/app_settings/settings_per_account.xml | 2 | 
2 files changed, 24 insertions, 1 deletions
| diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8d3a7327b9..f4bc092fce 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4192,6 +4192,17 @@        <key>Value</key>        <integer>255</integer>      </map> +    <key>ForceLoginURL</key> +    <map> +      <key>Comment</key> +      <string>Force a specified URL for login page content - used if exists</string> +      <key>Persist</key> +      <integer>1</integer> +      <key>Type</key> +      <string>String</string> +      <key>Value</key> +      <string></string> +    </map>      <key>ForceShowGrid</key>      <map>        <key>Comment</key> @@ -5325,6 +5336,18 @@        <key>Value</key>        <integer>1</integer>      </map> +  <key>LoginContentVersion</key> +  <map> +    <key>Comment</key> +    <string>Version of login page web based content to display</string> +    <key>Persist</key> +    <integer>0</integer> +    <key>Type</key> +    <string>String</string> +    <key>Value</key> +    <string>2</string> +  </map> +    <key>LoginSRVTimeout</key>    <map>      <key>Comment</key> diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index 500151c935..fc6f1f6395 100755 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -312,7 +312,7 @@          <key>Type</key>               <string>Boolean</string>          <key>Value</key> -             <integer>0</integer> +             <integer>1</integer>          </map>      <!-- End of back compatibility settings -->      </map> | 
