From 11915dc888da5d20c42167c7ba4f7afdf6911f45 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Mon, 3 Mar 2014 16:38:38 -0800
Subject: WENG-1470 (Partial impl) Secondlife Login Screen Redesign

---
 indra/newview/app_settings/settings.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'indra/newview/app_settings/settings.xml')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 4c7b192ae5..2e8d289148 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5293,6 +5293,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>
-- 
cgit v1.2.3


From f8a3eb551f1f546dfb1b887c98a8eab80d322003 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Wed, 5 Mar 2014 14:48:50 -0800
Subject: WENG-1470 (Partial) Secondlife Login Screen Redesign - steady
 progress

---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/app_settings/settings.xml')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 2e8d289148..8c57b70e20 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4171,6 +4171,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>
+      <integer></integer>
+    </map>
     <key>ForceShowGrid</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From bf46ac548bb3db0c4412ac982fb41cbbd295bda7 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Wed, 5 Mar 2014 15:47:45 -0800
Subject: WENG-1470 (Partial) Secondlife Login Screen Redesign - more steady
 progress

---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/settings.xml')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 8c57b70e20..de1abd0bea 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4180,7 +4180,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <integer></integer>
+      <string></string>
     </map>
     <key>ForceShowGrid</key>
     <map>
-- 
cgit v1.2.3