From b98f29b015e26106e9c8f06900618af2709dcbf0 Mon Sep 17 00:00:00 2001 From: Beq Date: Sat, 13 Feb 2021 02:58:44 +0000 Subject: [PATCH] FIRE-13223 - Grid Manager does not update properly --- indra/newview/fspanellogin.cpp | 2 +- indra/newview/llfloaterpreference.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/indra/newview/fspanellogin.cpp b/indra/newview/fspanellogin.cpp index 6699d6bed9..2f5d1449ec 100644 --- a/indra/newview/fspanellogin.cpp +++ b/indra/newview/fspanellogin.cpp @@ -1413,7 +1413,7 @@ void FSPanelLogin::updateServerCombo() server_choice_combo->addSeparator(ADD_TOP); LL_DEBUGS("AppInit") << "adding current " << current_grid << LL_ENDL; - server_choice_combo->add(LLGridManager::getInstance()->getGridLabel(), + server_choice_combo->add(LLGridManager::getInstance()->getGridLabel(current_grid), current_grid, ADD_TOP); server_choice_combo->selectFirstItem(); diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index f7ef007017..673529369e 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -5972,7 +5972,10 @@ void LLPanelPreferenceOpensim::onClickRefreshGrid() std::string grid = mGridListControl->getSelectedValue(); getChild("grid_management_panel")->setEnabled(FALSE); LLGridManager::getInstance()->addGridListChangedCallback(boost::bind(&LLPanelPreferenceOpensim::refreshGridList, this, _1)); - LLGridManager::getInstance()->reFetchGrid(grid); + // FIRE-13223 grid info refresh does not update properly when applied to currently active grid + // LLGridManager::getInstance()->reFetchGrid(grid); + LLGridManager::getInstance()->reFetchGrid(grid, (grid == LLGridManager::getInstance()->getGrid()) ); + // } void LLPanelPreferenceOpensim::onClickRemoveGrid()