From 0c9d3203da6b474bdeef848f5394ee5369662ecb Mon Sep 17 00:00:00 2001 From: callum_linden Date: Tue, 18 Mar 2014 17:35:46 -0700 Subject: WENG-1470: one more change to match new design --- indra/newview/llpanellogin.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'indra') diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index cf9956d3e9..30dd12a68c 100755 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -1022,11 +1022,14 @@ void LLPanelLogin::updateLoginButtons() // last login button always enabled for this case last_login_btn->setEnabled(true); - // double check status of favorites combo + // double check status of favorites combo (must be items there and one must be selected to enable button) LLComboBox* favorites_combo = getChild("start_location_combo"); - unsigned int num_items = favorites_combo->getItemCount(); - if ( num_items > 0 ) + int num_items = favorites_combo->getItemCount(); + int selected_index = favorites_combo->getCurrentIndex(); + if ( num_items > 0 && selected_index >=0 ) mFavoriteSelected = true; + else + mFavoriteSelected = false; // only turn on favorites login button if one is selected fav_btn->setEnabled( mFavoriteSelected ); -- cgit v1.2.3