From 20c2eda0e1bf563afb73af3112ccd3d825147916 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 22 Jan 2015 14:12:34 +0200
Subject: MAINT-4790 WIP Previously selected login location is correctly shown
 now. Font on the Log In button was changed back. Text offset was set for
 Locations combobox.

---
 indra/newview/llpanellogin.cpp                     | 10 ++++++++--
 indra/newview/skins/default/xui/en/panel_login.xml |  7 ++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index fee240daa9..626340dcc9 100755
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -369,6 +369,10 @@ void LLPanelLogin::addFavoritesToStartLocation()
 			{
 				mShowFavorites = true;
 				combo->add(label, value);
+				if ( LLStartUp::getStartSLURL().getSLURLString() == value)
+				{
+					combo->selectByValue(value);
+				}
 			}
 		}
 		break;
@@ -683,7 +687,6 @@ 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.
 	 *
@@ -715,7 +718,10 @@ void LLPanelLogin::onUpdateStartSLURL(const LLSLURL& new_start_slurl)
 			}
 			if ( new_start_slurl.getLocationString().length() )
 			{
-				location_edit->setValue(new_start_slurl.getLocationString());
+				if (location_combo->getCurrentIndex() == -1)
+				{
+					location_combo->setLabel(new_start_slurl.getLocationString());
+				}
 				sInstance->mLocationLength = new_start_slurl.getLocationString().length();
 				sInstance->updateLoginButtons();
 			}
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 4c1455574b..204d812250 100755
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -80,7 +80,7 @@
     width="165" />
   <combo_box
     allow_text_entry="true"
-    control_name="NextLoginLocation"
+    control_name="NextLoginLocation"    
     follows="left|top"
     label="My favorite places"
     height="32"
@@ -92,7 +92,8 @@
     width="175"
     combo_button.scale_image="true">
     <combo_box.combo_editor
-      bg_image_always_focused="true"/>
+      bg_image_always_focused="true"
+      text_pad_left="8"/>
     <combo_box.item
       label="My last location"
       name="MyLastLocation"
@@ -109,7 +110,7 @@
     image_hover="PushButton_Login_Over"
     label="Log In"
     label_color="White"
-    font="SansSerifBold"
+    font="SansSerifMedium"
     name="connect_btn"
     enabled="true"    
     width="120"
-- 
cgit v1.2.3