diff options
| author | Jacek Antonelli | 2008-12-17 01:24:37 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2008-12-17 01:24:37 -0600 |
| commit | a3b0b6c299f791b3d8132d36a3d4c1790aea86b1 (patch) | |
| tree | 07d9080e0f71845fdf07f666907422b2fe6c4a3f /linden/indra/newview/llstartup.cpp | |
| parent | Use NType to find inventory icon name (part 2 of 2). (diff) | |
| parent | VWR-1582: Local ruler mode wrong for linked objects. (diff) | |
| download | meta-impy-a3b0b6c299f791b3d8132d36a3d4c1790aea86b1.zip meta-impy-a3b0b6c299f791b3d8132d36a3d4c1790aea86b1.tar.gz meta-impy-a3b0b6c299f791b3d8132d36a3d4c1790aea86b1.tar.bz2 meta-impy-a3b0b6c299f791b3d8132d36a3d4c1790aea86b1.tar.xz | |
Merge 1.1.0 alpha into quickfilter
Diffstat (limited to 'linden/indra/newview/llstartup.cpp')
| -rw-r--r-- | linden/indra/newview/llstartup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp index 625b1d8..6371f2b 100644 --- a/linden/indra/newview/llstartup.cpp +++ b/linden/indra/newview/llstartup.cpp | |||
| @@ -2458,14 +2458,14 @@ void login_show() | |||
| 2458 | // UI textures have been previously loaded in doPreloadImages() | 2458 | // UI textures have been previously loaded in doPreloadImages() |
| 2459 | 2459 | ||
| 2460 | LL_DEBUGS("AppInit") << "Setting Servers" << LL_ENDL; | 2460 | LL_DEBUGS("AppInit") << "Setting Servers" << LL_ENDL; |
| 2461 | 2461 | LL_INFOS("AppInit") << "getGridChoice is " << LLViewerLogin::getInstance()->getGridChoice() << LL_ENDL; | |
| 2462 | LLPanelLogin::addServer(LLViewerLogin::getInstance()->getGridLabel(), LLViewerLogin::getInstance()->getGridChoice()); | ||
| 2463 | 2462 | ||
| 2464 | LLViewerLogin* vl = LLViewerLogin::getInstance(); | 2463 | LLViewerLogin* vl = LLViewerLogin::getInstance(); |
| 2465 | for(int grid_index = GRID_INFO_NONE + 1; grid_index < GRID_INFO_OTHER; ++grid_index) | 2464 | for(int grid_index = GRID_INFO_NONE + 1; grid_index < GRID_INFO_OTHER; ++grid_index) |
| 2466 | { | 2465 | { |
| 2467 | LLPanelLogin::addServer(vl->getKnownGridLabel((EGridInfo)grid_index), grid_index); | 2466 | LLPanelLogin::addServer(vl->getKnownGridLabel((EGridInfo)grid_index), grid_index); |
| 2468 | } | 2467 | } |
| 2468 | LLPanelLogin::setServer(LLViewerLogin::getInstance()->getGridChoice()-1); | ||
| 2469 | } | 2469 | } |
| 2470 | 2470 | ||
| 2471 | // Callback for when login screen is closed. Option 0 = connect, option 1 = quit. | 2471 | // Callback for when login screen is closed. Option 0 = connect, option 1 = quit. |