summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcallum_linden <none@none>2014-03-18 17:35:46 -0700
committercallum_linden <none@none>2014-03-18 17:35:46 -0700
commit0c9d3203da6b474bdeef848f5394ee5369662ecb (patch)
tree41a792991444d14a641649b6f5370b68a2e24b47
parentd1499e5253cdc1f9b3c40765f80c000fa2e07a28 (diff)
WENG-1470: one more change to match new design
-rwxr-xr-xindra/newview/llpanellogin.cpp9
1 files changed, 6 insertions, 3 deletions
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<LLComboBox>("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 );