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

SUP-26198 - Grid list "freezes" when adding grid

meow-7.2.2
Beq 2020-11-07 01:47:01 +00:00
parent face468d7b
commit 926c4fecea
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/fsgridhandler.cpp
View File

@ -768,6 +768,8 @@ void LLGridManager::addGrid(GridEntry* grid_entry, AddState state)
if (existing_grid.has("DEPRECATED"))
{
LL_DEBUGS("GridManager") << "Removing entry marked as deprecated in the fallback list: " << grid << LL_ENDL;
mGridList[grid] = grid_entry->grid;
list_changed = true;
}
else if (grid_entry->grid.has("USER_DELETED"))
{

15
indra/newview/fspanellogin.cpp
View File

@ -1110,9 +1110,11 @@ void FSPanelLogin::onSelectServer()
LLGridManager::getInstance()->addGridListChangedCallback(boost::bind(&FSPanelLogin::gridListChanged, this, _1));
LLGridManager::getInstance()->addGrid(sPendingNewGridURI);
}
else
#endif
LLGridManager::getInstance()->setGridChoice(server_combo_val.asString());
{
LLGridManager::getInstance()->setGridChoice(server_combo_val.asString());
}
/*
* Determine whether or not the value in the start_location_combo makes sense
@ -1385,9 +1387,12 @@ void FSPanelLogin::updateServerCombo()
if (!sPendingNewGridURI.empty())
{
LLSD grid_name = LLGridManager::getInstance()->getGridByAttribute(GRID_LOGIN_URI_VALUE, sPendingNewGridURI, false);
LL_INFOS("AppInit") << "new grid for ["<<sPendingNewGridURI<<"]=["<< (grid_name.isUndefined()?"FAILED TO ADD":grid_name.asString())<< "]"<<LL_ENDL;
server_choice_combo->setSelectedByValue(grid_name, true);
LLGridManager::getInstance()->setGridChoice(grid_name.asString());
LL_INFOS("AppInit") << "new grid for ["<<sPendingNewGridURI<<"]=["<< ((grid_name.isUndefined() || grid_name.asString().length()==0)?"FAILED TO ADD":grid_name.asString())<< "]"<<LL_ENDL;
if(!grid_name.isUndefined() && grid_name.asString().length()!=0)
{
server_choice_combo->setSelectedByValue(grid_name, true);
LLGridManager::getInstance()->setGridChoice(grid_name.asString());
}
}
#endif