aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanellogin.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llpanellogin.cpp')
-rw-r--r--linden/indra/newview/llpanellogin.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index c709015..4998662 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -604,18 +604,17 @@ void LLPanelLogin::addServer(const std::string& server)
604 const std::string &defaultGrid = gHippoGridManager->getDefaultGridNick(); 604 const std::string &defaultGrid = gHippoGridManager->getDefaultGridNick();
605 605
606 LLComboBox *grids = sInstance->getChild<LLComboBox>("server_combo"); 606 LLComboBox *grids = sInstance->getChild<LLComboBox>("server_combo");
607 S32 selectIndex = -1, i = 0; 607 S32 i = 0;
608 grids->removeall(); 608 grids->removeall();
609 if (defaultGrid != "") { 609 if (defaultGrid != "") {
610 grids->add(defaultGrid); 610 grids->add(defaultGrid);
611 selectIndex = i++; 611 i++;
612 } 612 }
613 HippoGridManager::GridIterator it, end = gHippoGridManager->endGrid(); 613 HippoGridManager::GridIterator it, end = gHippoGridManager->endGrid();
614 for (it = gHippoGridManager->beginGrid(); it != end; ++it) { 614 for (it = gHippoGridManager->beginGrid(); it != end; ++it) {
615 const std::string &grid = it->second->getGridNick(); 615 const std::string &grid = it->second->getGridNick();
616 if (grid != defaultGrid) { 616 if (grid != defaultGrid) {
617 grids->add(grid); 617 grids->add(grid);
618 //if (grid == mCurGrid) selectIndex = i;
619 i++; 618 i++;
620 } 619 }
621 } 620 }