From 61dfff44d4cead9d17a78b16ad7371b76df7654a Mon Sep 17 00:00:00 2001 From: "Mark Palange (Mani)" Date: Wed, 25 Nov 2009 14:38:17 -0800 Subject: Change to ensure the start location combo box is being read and stored properly. --- indra/newview/llpanellogin.cpp | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'indra/newview/llpanellogin.cpp') diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index ec0f8e303c..97f01d2c74 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -225,6 +225,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect, LLComboBox* combo = getChild("start_location_combo"); + LLURLSimString::setString(gSavedSettings.getString("LoginLocation")); std::string sim_string = LLURLSimString::sInstance.mSimString; if (!sim_string.empty()) { @@ -892,12 +893,27 @@ void LLPanelLogin::onClickConnect(void *) LLComboBox* combo = sInstance->getChild("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=="" || 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) { LLNotifications::instance().add("MustHaveAccountToLogIn"); } - else if( (combo_text=="" || combo_text =="") - && LLURLSimString::sInstance.mSimString =="") + else if(!has_location) { LLNotifications::instance().add("StartRegionEmpty"); } -- cgit v1.2.3