Updated Grid Manager from Meerkat's SVN (as of r215).

1 files changed, 3 insertions, 46 deletions

diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 2ecdcb5..026b0b2 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -1078,10 +1078,9 @@ void LLPanelLogin::onClickGrid(void *)
 {
         if (sInstance && sInstance->mCallback)
         {
-                LoginFloater::newShow(std::string("Test"), false, LoginFloater::testCallback, NULL);
+                LoginFloater::newShow(std::string("Test"), false);
         }
 }
- 
 
 // static
 void LLPanelLogin::newAccountAlertCallback(S32 option, void*)
@@ -1164,8 +1163,6 @@ void LLPanelLogin::onSelectServer(LLUICtrl* ctrl, void*)
         std::string mCurGrid = ctrl->getValue().asString();
         //KOW
         gHippoGridManager->setCurrentGrid(mCurGrid);
-        //gHippoGridManager->setDefaultGrid(mCurGrid);
-        //gHippoGridManager->saveFile();
         HippoGridInfo *gridInfo = gHippoGridManager->getGrid(mCurGrid);
                 if (gridInfo) {
                         //childSetText("gridnick", gridInfo->getGridNick());
@@ -1177,54 +1174,14 @@ void LLPanelLogin::onSelectServer(LLUICtrl* ctrl, void*)
 
 
         
-                llwarns << "current grid = " << mCurGrid << llendl;
 
-        /*
 
-        if (LLSD::TypeInteger == combo_val.type())
-        {
-                grid_index = combo->getValue().asInteger();
-
-                if ((S32)GRID_INFO_OTHER == grid_index)
-                {
-                        // This happens if the user specifies a custom grid
-                        // via command line.
-                        grid_label = combo->getSimple();
-                }
-        }
-        else
-        {
-                // no valid selection, return other
-                grid_index = (S32)GRID_INFO_OTHER;
-                grid_label = combo_val.asString();
-        }
-
-        // This new seelction will override preset uris
-        // from the command line.
-        LLViewerLogin* vl = LLViewerLogin::getInstance();
-        vl->resetURIs();
-        if(grid_index != GRID_INFO_OTHER)
-        {
-                vl->setGridChoice(grid_index);
-        }
-        else
-        {
-                vl->setGridChoice(grid_label);
-        }
+        
+        llwarns << "current grid = " << mCurGrid << llendl;
 
-        // clear the password if we are switching grids so we don't send
-        // the wrong pass to the wrong grid.
-        if (sInstance)
-        {
-                // no method to clear a text box?
-                const std::string nothing("");
-                sInstance->childSetText("password_edit", nothing);              
-        }
-        */      
         // grid changed so show new splash screen (possibly)
         loadLoginPage();
 }
-
 /*
 void LLPanelLogin::onServerComboLostFocus(LLFocusableElement* fe, void*)
 {