From 0ea82ffbcc764049686367a3c5cee101d9fb1fd9 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Mon, 17 Mar 2014 14:17:09 -0700 Subject: WENG-1470 (Partial) Secondlife Login Screen Redesign - fixed bug with favorites button not being enabled even though Home was present in list --- indra/newview/llpanellogin.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra') diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 95c95730ec..cf9956d3e9 100755 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -1022,6 +1022,12 @@ void LLPanelLogin::updateLoginButtons() // last login button always enabled for this case last_login_btn->setEnabled(true); + // double check status of favorites combo + LLComboBox* favorites_combo = getChild("start_location_combo"); + unsigned int num_items = favorites_combo->getItemCount(); + if ( num_items > 0 ) + mFavoriteSelected = true; + // only turn on favorites login button if one is selected fav_btn->setEnabled( mFavoriteSelected ); -- cgit v1.2.3