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 +-
 indra/newview/llpanellogin.cpp                     |  9 ++--
 .../default/xui/en/panel_preferences_general.xml   | 63 ++++++++--------------
 .../default/xui/en/panel_preferences_privacy.xml   | 11 ----
 4 files changed, 30 insertions(+), 55 deletions(-)

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>
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 7a6a9309a0..437db62cac 100755
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -272,7 +272,8 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 	childSetAction("connect_favorite_btn", onClickConnectFavorite, this);
 	childSetAction("connect_location_btn", onClickConnectLocation, this);
 
-	setDefaultBtn("connect_btn");
+	LLButton* def_btn = getChild<LLButton>("connect_btn");
+	setDefaultBtn(def_btn);
 
 	std::string channel = LLVersionInfo::getChannel();
 	std::string version = llformat("%s (%d)",
@@ -643,6 +644,7 @@ void LLPanelLogin::onUpdateStartSLURL(const LLSLURL& new_start_slurl)
 	LL_DEBUGS("AppInit")<<new_start_slurl.asString()<<LL_ENDL;
 
 	LLComboBox* location_combo = sInstance->getChild<LLComboBox>("start_location_combo");
+	LLLineEditor* location_edit = sInstance->getChild<LLLineEditor>("location_edit");
 	/*
 	 * Determine whether or not the new_start_slurl modifies the grid.
 	 *
@@ -672,7 +674,8 @@ void LLPanelLogin::onUpdateStartSLURL(const LLSLURL& new_start_slurl)
 
 				updateServer(); // to change the links and splash screen
 			}
-			location_combo->setTextEntry(new_start_slurl.getLocationString());
+			//location_combo->setTextEntry(new_start_slurl.getLocationString());
+			location_edit->setValue(new_start_slurl.getLocationString());
 		}
 		else
 		{
@@ -757,7 +760,7 @@ void LLPanelLogin::loadLoginPage()
 
 	// allow users (testers really) to specify a different login content URL
 	std::string force_login_url = gSavedSettings.getString("ForceLoginURL");
-	if ( force_login_url.length() )
+	if ( force_login_url.length() > 0 )
 	{
 		login_page = LLURI(force_login_url);
 	}
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index ea0f7d8593..9da044ab64 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -179,46 +179,29 @@
      left_pad="2"
      name="rating_icon_adult"
      width="18"/>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="15"
-     layout="topleft"
-     left="30"
-     name="start_location_textbox"
-     top_pad="8"
-     width="394">
-        Start location:
-    </text>
-    <combo_box
-     control_name="LoginLocation"
-     follows="left|top"
-     height="23"
-     layout="topleft"
-     name="start_location_combo"
-     left="50"
-     width="200">
-        <combo_box.item
-         label="My Last Location"
-         name="MyLastLocation"
-         value="last" />
-        <combo_box.item
-         label="My Home"
-         name="MyHome"
-         value="home" />
-    </combo_box>
-    <check_box
-     control_name="ShowStartLocation"
-     height="16"
-     initial_value="true"
-     label="Show on login"
-     layout="topleft"
-     left_pad="5"
-     name="show_location_checkbox"
-     top_delta="5"
-     width="256" />
-   <text
+     <check_box
+       control_name="ShowFavoritesOnLogin"
+       enabled="false" 
+       height="16"
+       layout="topleft"
+       label="Show favorite locations on login screen"
+       left="30"
+       name="favorites_on_login_check"
+       top_pad="10"
+       width="350" />
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="15"
+   layout="topleft"
+   left="52"
+   name="favorites_check_extra_text"
+   top_pad="0"
+   width="400">
+    (Others using this computer will also see them)
+  </text>
+  <text
     type="string"
     length="1"
     follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 78743d26bb..05a63ea725 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -74,17 +74,6 @@
      name="auto_disengage_mic_check"
      top_pad="10"
      width="350" />
-    <check_box
-     control_name="ShowFavoritesOnLogin"
-     enabled="false" 
-     height="16"
-     layout="topleft"
-     label="Show my Favorite Landmarks at Login (via &apos;Start At&apos; drop-down menu)"
-     left="30"
-     name="favorites_on_login_check"
-     top_pad="10"
-     width="350" />
-
     <button
      follows="left|bottom"
      height="23"
-- 
cgit v1.2.3