Fixed login grid combobox not updating correctly after logout

2 files changed, 15 insertions, 1 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index d933f27..fef6fec 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -22,6 +22,11 @@
           
 2009-11-07 McCabe Maxsted  <hakushakukun@gmail.com>
 
+        * Fixed login grid combobox not updating correctly after logout.
+        
+          modified:   linden/indra/newview/llpanellogin.cpp
+          
+          
         * Applied RLVa-1.0.5e_20091107_Imprudence-1.2.0-diff.patch.
         
           modified:   linden/indra/newview/llagent.cpp
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)
                         i++;
                 }
         }
-        grids->setCurrentByIndex(0);
+        
+        // when you first login select the default, otherwise last connected
+        if (gDisconnected)
+        {
+                grids->setSimple(gHippoGridManager->getCurrentGrid()->getGridNick());
+        }
+        else
+        {
+                grids->setSimple(defaultGrid);
+        }
 
         //LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
         //combo->add(server, LLSD(domain_name) );