diff options
| author | McCabe Maxsted | 2009-11-07 17:36:37 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-11-07 17:36:37 -0700 |
| commit | 84fa2d2580647440e4befe07b9f9a3eed64bb70c (patch) | |
| tree | cc6ea1730a52bb1c7c62d6a62c138fb329e9e5c2 /linden/indra | |
| parent | Applied RLVa-1.0.5e_20091107_Imprudence-1.2.0-diff.patch (diff) | |
| download | meta-impy-84fa2d2580647440e4befe07b9f9a3eed64bb70c.zip meta-impy-84fa2d2580647440e4befe07b9f9a3eed64bb70c.tar.gz meta-impy-84fa2d2580647440e4befe07b9f9a3eed64bb70c.tar.bz2 meta-impy-84fa2d2580647440e4befe07b9f9a3eed64bb70c.tar.xz | |
Fixed login grid combobox not updating correctly after logout
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/newview/llpanellogin.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp index 27e6043..5dde3a3 100644 --- a/linden/indra/newview/llpanellogin.cpp +++ b/linden/indra/newview/llpanellogin.cpp | |||
| @@ -720,7 +720,16 @@ void LLPanelLogin::addServer(const std::string& server) | |||
| 720 | i++; | 720 | i++; |
| 721 | } | 721 | } |
| 722 | } | 722 | } |
| 723 | grids->setCurrentByIndex(0); | 723 | |
| 724 | // when you first login select the default, otherwise last connected | ||
| 725 | if (gDisconnected) | ||
| 726 | { | ||
| 727 | grids->setSimple(gHippoGridManager->getCurrentGrid()->getGridNick()); | ||
| 728 | } | ||
| 729 | else | ||
| 730 | { | ||
| 731 | grids->setSimple(defaultGrid); | ||
| 732 | } | ||
| 724 | 733 | ||
| 725 | //LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo"); | 734 | //LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo"); |
| 726 | //combo->add(server, LLSD(domain_name) ); | 735 | //combo->add(server, LLSD(domain_name) ); |