summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2014-03-17 14:17:09 -0700
committerCallum Prentice <callum@lindenlab.com>2014-03-17 14:17:09 -0700
commit0ea82ffbcc764049686367a3c5cee101d9fb1fd9 (patch)
tree29ed3de3bfd024a5afdf092480ac96a2ff908d73 /indra
parent3c6e5d4a11310ac42b56c782b77aef67a21f79b3 (diff)
WENG-1470 (Partial) Secondlife Login Screen Redesign - fixed bug with favorites button not being enabled even though Home was present in list
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llpanellogin.cpp6
1 files changed, 6 insertions, 0 deletions
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<LLComboBox>("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 );