merge

1 files changed, 19 insertions, 3 deletions

diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index bde34302ed..d2a17dbd97 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -226,6 +226,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 
 	LLComboBox* combo = getChild<LLComboBox>("start_location_combo");
 
+	LLURLSimString::setString(gSavedSettings.getString("LoginLocation"));
 	std::string sim_string = LLURLSimString::sInstance.mSimString;
 	if (!sim_string.empty())
 	{
@@ -893,12 +894,27 @@ void LLPanelLogin::onClickConnect(void *)
 		LLComboBox* combo = sInstance->getChild<LLComboBox>("start_location_combo");
 		std::string combo_text = combo->getSimple();
 		
-		if (first.empty() || last.empty())
+		bool has_first_and_last = !(first.empty() || last.empty());
+		bool has_location = false;
+
+		if(combo_text=="<Type region name>" || combo_text =="")
+		{
+			// *NOTE: Mani - Location field is not always committed by this point!
+			// This may be duplicate work, but better than not doing the work!
+			LLURLSimString::sInstance.setString("");
+		}
+		else 
+		{
+			// *NOTE: Mani - Location field is not always committed by this point!
+			LLURLSimString::sInstance.setString(combo_text);
+			has_location = true;
+		}
+
+		if(!has_first_and_last)
 		{
 			LLNotificationsUtil::add("MustHaveAccountToLogIn");
 		}
-		else if( (combo_text=="<Type region name>" || combo_text =="")
-				&& LLURLSimString::sInstance.mSimString =="")
+		else if(!has_location)
 		{
 			LLNotificationsUtil::add("StartRegionEmpty");
 		}