aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llstartup.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 4266d82..c863d19 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2492,14 +2492,14 @@ void login_show()
2492 // UI textures have been previously loaded in doPreloadImages() 2492 // UI textures have been previously loaded in doPreloadImages()
2493 2493
2494 LL_DEBUGS("AppInit") << "Setting Servers" << LL_ENDL; 2494 LL_DEBUGS("AppInit") << "Setting Servers" << LL_ENDL;
2495 2495 LL_INFOS("AppInit") << "getGridChoice is " << LLViewerLogin::getInstance()->getGridChoice() << LL_ENDL;
2496 LLPanelLogin::addServer(LLViewerLogin::getInstance()->getGridLabel(), LLViewerLogin::getInstance()->getGridChoice());
2497 2496
2498 LLViewerLogin* vl = LLViewerLogin::getInstance(); 2497 LLViewerLogin* vl = LLViewerLogin::getInstance();
2499 for(int grid_index = GRID_INFO_NONE + 1; grid_index < GRID_INFO_OTHER; ++grid_index) 2498 for(int grid_index = GRID_INFO_NONE + 1; grid_index < GRID_INFO_OTHER; ++grid_index)
2500 { 2499 {
2501 LLPanelLogin::addServer(vl->getKnownGridLabel((EGridInfo)grid_index), grid_index); 2500 LLPanelLogin::addServer(vl->getKnownGridLabel((EGridInfo)grid_index), grid_index);
2502 } 2501 }
2502 LLPanelLogin::setServer(LLViewerLogin::getInstance()->getGridChoice()-1);
2503} 2503}
2504 2504
2505// Callback for when login screen is closed. Option 0 = connect, option 1 = quit. 2505// Callback for when login screen is closed. Option 0 = connect, option 1 = quit.