FIRE-17518: Opening Preferences from the login screen breaks the login page layout

Thu, 21 Apr 2016 12:00:05 +0200

author
Ansariel
date
Thu, 21 Apr 2016 12:00:05 +0200
changeset 48972
7830ce7960ca
parent 48971
24909feee264
child 48973
e91e271b8c27

FIRE-17518: Opening Preferences from the login screen breaks the login page layout

indra/newview/fspanellogin.cpp file | annotate | diff | revisions
indra/newview/llfloaterpreference.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/fspanellogin.cpp	Thu Apr 21 10:36:33 2016 +0200
     1.2 +++ b/indra/newview/fspanellogin.cpp	Thu Apr 21 12:00:05 2016 +0200
     1.3 @@ -268,10 +268,6 @@
     1.4  	LLTextBox* forgot_password_text = getChild<LLTextBox>("forgot_password_text");
     1.5  	forgot_password_text->setClickedCallback(onClickForgotPassword, NULL);
     1.6  	
     1.7 -	// get the web browser control
     1.8 -	LLMediaCtrl* web_browser = getChild<LLMediaCtrl>("login_html");
     1.9 -	web_browser->addObserver(this);
    1.10 -
    1.11  	loadLoginPage();
    1.12  
    1.13  	LLComboBox* username_combo(getChild<LLComboBox>("username_combo"));
    1.14 @@ -1318,9 +1314,6 @@
    1.15  {
    1.16  	if (!sInstance) return;
    1.17  	
    1.18 -#ifdef OPENSIM
    1.19 -	LLGridManager::getInstance()->addGridListChangedCallback(&FSPanelLogin::gridListChanged);
    1.20 -#endif // OPENSIM
    1.21  	// We add all of the possible values, sorted, and then add a bar and the current value at the top
    1.22  	LLComboBox* server_choice_combo = sInstance->getChild<LLComboBox>("server_combo");
    1.23  	server_choice_combo->removeall();
     2.1 --- a/indra/newview/llfloaterpreference.cpp	Thu Apr 21 10:36:33 2016 +0200
     2.2 +++ b/indra/newview/llfloaterpreference.cpp	Thu Apr 21 12:00:05 2016 +0200
     2.3 @@ -4495,6 +4495,7 @@
     2.4  void LLPanelPreferenceOpensim::apply()
     2.5  {
     2.6  	LLGridManager::getInstance()->saveGridList();
     2.7 +	FSPanelLogin::updateServer();
     2.8  }
     2.9  
    2.10  void LLPanelPreferenceOpensim::cancel()
    2.11 @@ -4596,6 +4597,8 @@
    2.12  
    2.13  void LLPanelPreferenceOpensim::refreshGridList(bool success)
    2.14  {
    2.15 +	FSPanelLogin::updateServer();
    2.16 +
    2.17  	getChild<LLUICtrl>("grid_management_panel")->setEnabled(TRUE);
    2.18  
    2.19  	if (!mGridListControl)

mercurial