diff options
| author | Jacek Antonelli | 2008-12-10 23:35:38 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2008-12-10 23:35:38 -0600 |
| commit | eb6c9309a9d0c76da6153b8290d33d50f56b9786 (patch) | |
| tree | e4a02a277dc7da58eab72b2a46c79a789da234de /linden/indra/newview/llstartup.cpp | |
| parent | Better warning when url_history.xml save fails. (diff) | |
| download | meta-impy-eb6c9309a9d0c76da6153b8290d33d50f56b9786.zip meta-impy-eb6c9309a9d0c76da6153b8290d33d50f56b9786.tar.gz meta-impy-eb6c9309a9d0c76da6153b8290d33d50f56b9786.tar.bz2 meta-impy-eb6c9309a9d0c76da6153b8290d33d50f56b9786.tar.xz | |
Fix grid selector having a duplicate entry. [#24]
Patch by Balp Allen.
Diffstat (limited to '')
| -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. |