livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-13223 - Grid Manager does not update properly

meow-7.2.2
Beq 2021-02-13 02:58:44 +00:00
parent fb1d3dbee3
commit b98f29b015
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/fspanellogin.cpp
View File

@ -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();

5
indra/newview/llfloaterpreference.cpp
View File

@ -5972,7 +5972,10 @@ void LLPanelPreferenceOpensim::onClickRefreshGrid()
std::string grid = mGridListControl->getSelectedValue();
getChild<LLUICtrl>("grid_management_panel")->setEnabled(FALSE);
LLGridManager::getInstance()->addGridListChangedCallback(boost::bind(&LLPanelPreferenceOpensim::refreshGridList, this, _1));
LLGridManager::getInstance()->reFetchGrid(grid);
// <FS:Beq> 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()) );
// </FS:Beq>
}
void LLPanelPreferenceOpensim::onClickRemoveGrid()