Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the grids combobox on the login panel not being scrollable because of constantly reordering grids

Browse Source 
Still select the current grid, just use its index number to select it, instead of hacking it to the top of the combo box.
This commit is contained in:
Inusaito Sayori
2014-07-23 18:12:18 -04:00
parent d7bbbd9d40
commit 1c5872da0c
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llpanellogin.cpp
View File

@@ -741,21 +741,24 @@ void LLPanelLogin::updateGridCombo()
const HippoGridInfo *curGrid = gHippoGridManager->getCurrentGrid();
const HippoGridInfo *defGrid = gHippoGridManager->getGrid(defaultGrid);
S32 idx(-1);
HippoGridManager::GridIterator it, end = gHippoGridManager->endGrid();
for (it = gHippoGridManager->beginGrid(); it != end; ++it)
{
std::string grid = it->second->getGridName();
if(grid.empty() || it->second == defGrid || it->second == curGrid)
if (grid.empty() || it->second == defGrid)
continue;
if (it->second == curGrid) idx = grids->getItemCount();
grids->add(grid);
}
if(curGrid || defGrid)
if (curGrid || defGrid)
{
if(defGrid)
if (defGrid)
{
grids->add(defGrid->getGridName(),ADD_TOP);
if(curGrid && defGrid != curGrid)
grids->add(curGrid->getGridName(),ADD_TOP);
grids->setCurrentByIndex(0);
++idx;
}
grids->setCurrentByIndex(idx);
}
else
{