Commit 5b9d2957 authored by NiranV's avatar NiranV

Fixed: Viewer crashing-locking on startup when user changed the starting location last run.

parent 68b9239b
......@@ -240,6 +240,11 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
reshape(rect.getWidth(), rect.getHeight());
//BD
mLoginBtn = getChild<LLButton>("connect_btn");
mLoginBtn->setCommitCallback(boost::bind(&LLPanelLogin::onClickConnect, this));
mLoginBtn->setFocus(true);
mFavoritesCombo = getChild<LLComboBox>("start_location_combo");
mFavoritesCombo->setReturnCallback(boost::bind(&LLPanelLogin::onClickConnect, this));
mFavoritesCombo->setFocusLostCallback(boost::bind(&LLPanelLogin::onLocationSLURL, this));
......@@ -319,11 +324,6 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
onUpdateStartSLURL(start_slurl); // updates grid if needed
}
//BD
mLoginBtn = getChild<LLButton>("connect_btn");
mLoginBtn->setCommitCallback(boost::bind(&LLPanelLogin::onClickConnect, this));
mLoginBtn->setFocus(true);
//BD - Show last logged in user favorites in "Start at" combo.
addFavoritesToStartLocation();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment