From cccdd1fb397240fda99663b403e00b2582c202ba Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Fri, 30 Jan 2015 15:36:00 +0200 Subject: MAINT-4853 FIXED Pressing the ENTER key when entering a location into the Type a location field, doesn't log you in --- indra/newview/llpanellogin.cpp | 2 +- indra/newview/skins/default/xui/en/panel_login.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index b181ea217b..a6a7150ae7 100755 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -210,7 +210,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect, LLComboBox* favorites_combo = getChild("start_location_combo"); updateLocationSelectorsVisibility(); // separate so that it can be called from preferences - favorites_combo->setCommitCallback(boost::bind(&LLPanelLogin::onClickConnect, this)); + favorites_combo->setReturnCallback(boost::bind(&LLPanelLogin::onClickConnect, this)); favorites_combo->setFocusLostCallback(boost::bind(&LLPanelLogin::onLocationSLURL, this)); LLComboBox* server_choice_combo = getChild("server_combo"); diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 204d812250..183ae2e824 100755 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -85,7 +85,7 @@ label="My favorite places" height="32" max_chars="128" - combo_editor.font="SansSerifMedium" + combo_editor.font="SansSerifLarge" left_pad="15" bottom_delta="0" name="start_location_combo" -- cgit v1.2.3