1 files changed, 116 insertions, 41 deletions

diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index c26f70f..873920c 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -34,6 +34,8 @@
 #include "llpanellogin.h"
 #include "llpanelgeneral.h"
 
+#include "hippoGridManager.h"
+
 #include "indra_constants.h"            // for key and mask constants
 #include "llfontgl.h"
 #include "llmd5.h"
@@ -63,17 +65,22 @@
 #include "llviewernetwork.h"
 #include "llviewerwindow.h"                     // to link into child list
 #include "llnotify.h"
+#include "llappviewer.h"                                        // for gHideLinks
 #include "llurlsimstring.h"
 #include "lluictrlfactory.h"
 #include "llhttpclient.h"
 #include "llweb.h"
 #include "llwebbrowserctrl.h"
 
+#include "llfloaterhtml.h"
+
 #include "llfloaterhtmlhelp.h"
 #include "llfloatertos.h"
 
 #include "llglheaders.h"
 
+#include "floaterlogin.h"
+
 #define USE_VIEWER_AUTH 0
 
 std::string load_password_from_disk(void);
@@ -130,21 +137,8 @@ void LLLoginHandler::parse(const LLSD& queryMap)
         mFirstName = queryMap["first_name"].asString();
         mLastName = queryMap["last_name"].asString();
         
-        EGridInfo grid_choice = GRID_INFO_NONE;
-        if (queryMap["grid"].asString() == "sl beta grid")
-        {
-                grid_choice = GRID_INFO_ADITI;
-        }
-        else if (queryMap["grid"].asString() == "sl main grid")
-        {
-                grid_choice = GRID_INFO_AGNI;
-        }
-
-        if(grid_choice != GRID_INFO_NONE)
-        {
-                LLViewerLogin::getInstance()->setGridChoice(grid_choice);
-        }
-
+        const std::string &grid = queryMap["grid"].asString();
+        if (grid != "") gHippoGridManager->setCurrentGrid(grid);
         std::string startLocation = queryMap["location"].asString();
 
         if (startLocation == "specify")
@@ -258,11 +252,6 @@ namespace {
         boost::intrusive_ptr< LLIamHereLogin > gResponsePtr = 0;
 };
 
-void set_start_location(LLUICtrl* ctrl, void* data)
-{
-    LLURLSimString::setString(ctrl->getValue().asString());
-}
-
 //---------------------------------------------------------------------------
 // Public methods
 //---------------------------------------------------------------------------
@@ -349,13 +338,13 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
                 combo->setCurrentByIndex( 0 );
         }
 
-        combo->setCommitCallback( &set_start_location );
 
         LLComboBox* server_choice_combo = sInstance->getChild<LLComboBox>("server_combo");
         server_choice_combo->setCommitCallback(onSelectServer);
-        server_choice_combo->setFocusLostCallback(onServerComboLostFocus);
+        //server_choice_combo->setFocusLostCallback(onServerComboLostFocus);
 
         childSetAction("connect_btn", onClickConnect, this);
+        childSetAction("grid_btn", onClickGrid, this);
 
         setDefaultBtn("connect_btn");
 
@@ -657,6 +646,7 @@ void LLPanelLogin::show(const LLRect &rect,
 
         // Make sure that focus always goes here (and use the latest sInstance that was just created)
         gFocusMgr.setDefaultKeyboardFocus(sInstance);
+        LLPanelLogin::addServer(LLViewerLogin::getInstance()->getGridLabel());
 }
 
 // static
@@ -701,7 +691,7 @@ void LLPanelLogin::setFields(const std::string& firstname, const std::string& la
 
 
 // static
-void LLPanelLogin::addServer(const std::string& server, S32 domain_name)
+void LLPanelLogin::addServer(const std::string& server)
 {
         if (!sInstance)
         {
@@ -709,17 +699,29 @@ void LLPanelLogin::addServer(const std::string& server, S32 domain_name)
                 return;
         }
 
-        LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
-        combo->add(server, LLSD(domain_name) );
-        combo->setCurrentByIndex(0);
-}
+        const std::string &defaultGrid = gHippoGridManager->getDefaultGridNick();
 
+        LLComboBox *grids = sInstance->getChild<LLComboBox>("server_combo");
+        S32 selectIndex = -1, i = 0;
+        grids->removeall();
+        if (defaultGrid != "") {
+                grids->add(defaultGrid);
+                selectIndex = i++;
+        }
+        HippoGridManager::GridIterator it, end = gHippoGridManager->endGrid();
+        for (it = gHippoGridManager->beginGrid(); it != end; ++it) {
+                const std::string &grid = it->second->getGridNick();
+                if (grid != defaultGrid) {
+                        grids->add(grid);
+                        //if (grid == mCurGrid) selectIndex = i;
+                        i++;
+                }
+        }
+        grids->setCurrentByIndex(0);
 
-// static
-void LLPanelLogin::setServer(S32 domain_name)
-{
-        LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
-        combo->setCurrentByIndex(domain_name);
+        //LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
+        //combo->add(server, LLSD(domain_name) );
+        //combo->setCurrentByIndex(0);
 }
 
 // static
@@ -800,7 +802,12 @@ void LLPanelLogin::refreshLocation( bool force_visible )
         sInstance->childSetVisible("start_location_combo", show_start);
         sInstance->childSetVisible("start_location_text", show_start);
 
+/*#if LL_RELEASE_FOR_DOWNLOAD
+        BOOL show_server = gSavedSettings.getBOOL("ForceShowGrid");
+        sInstance->childSetVisible("server_combo", show_server);
+#else*/
         sInstance->childSetVisible("server_combo", TRUE);
+//#endif
 
 #endif
 }
@@ -833,18 +840,39 @@ void LLPanelLogin::setAlwaysRefresh(bool refresh)
 }
 
 
+// static
+void LLPanelLogin::refreshLoginPage()
+{
+    if (!sInstance) return;
+
+    sInstance->childSetVisible("create_new_account_text",
+        !gHippoGridManager->getConnectedGrid()->getRegisterUrl().empty());
+    sInstance->childSetVisible("forgot_password_text",
+        !gHippoGridManager->getConnectedGrid()->getPasswordUrl().empty());
+
+    // kick off a request to grab the url manually
+        gResponsePtr = LLIamHereLogin::build(sInstance);
+        std::string login_page = gHippoGridManager->getConnectedGrid()->getLoginPage();
+        if (!login_page.empty()) {
+                LLHTTPClient::head(login_page, gResponsePtr);
+        } else {
+                sInstance->setSiteIsAlive(false);
+        }
+}
+
 
 void LLPanelLogin::loadLoginPage()
 {
         if (!sInstance) return;
         
-        std::ostringstream oStr;
 
-        std::string login_page = gSavedSettings.getString("LoginPage");
-        if (login_page.empty())
-        {
-                login_page = sInstance->getString( "real_url" );
+        std::string login_page = gHippoGridManager->getConnectedGrid()->getLoginPage();
+        if (login_page.empty()) {
+                sInstance->setSiteIsAlive(false);
+                return;
         }
+
+        std::ostringstream oStr;
         oStr << login_page;
         
         // Use the right delimeter depending on how LLURI parses the URL
@@ -879,11 +907,12 @@ void LLPanelLogin::loadLoginPage()
         curl_free(curl_version);
 
         // Grid
-        char* curl_grid = curl_escape(LLViewerLogin::getInstance()->getGridCodeName().c_str(), 0);
+        char* curl_grid = curl_escape(LLViewerLogin::getInstance()->getGridLabel().c_str(), 0);
         oStr << "&grid=" << curl_grid;
         curl_free(curl_grid);
 
         gViewerWindow->setMenuBackgroundColor(false, !LLViewerLogin::getInstance()->isInProductionGrid());
+        //LLViewerLogin::getInstance()->setMenuColor();
         gLoginMenuBarView->setBackgroundColor(gMenuBarView->getBackgroundColor());
 
 
@@ -1017,12 +1046,27 @@ void LLPanelLogin::onClickConnect(void *)
                 }
                 else
                 {
+                        if (gHideLinks)
+                        {
+                                gViewerWindow->alertXml("MustHaveAccountToLogInNoLinks");
+                        }
+                        else
+                        {
                         gViewerWindow->alertXml("MustHaveAccountToLogIn",
                                                                         LLPanelLogin::newAccountAlertCallback);
                 }
         }
 }
+}
 
+void LLPanelLogin::onClickGrid(void *)
+{
+        if (sInstance && sInstance->mCallback)
+        {
+                LoginFloater::newShow(std::string("Test"), false, LoginFloater::testCallback, NULL);
+        }
+}
+ 
 
 // static
 void LLPanelLogin::newAccountAlertCallback(S32 option, void*)
@@ -1088,7 +1132,7 @@ void LLPanelLogin::onPassKey(LLLineEditor* caller, void* user_data)
 }
 
 // static
-void LLPanelLogin::onSelectServer(LLUICtrl*, void*)
+void LLPanelLogin::onSelectServer(LLUICtrl* ctrl, void*)
 {
         // *NOTE: The paramters for this method are ignored. 
         // LLPanelLogin::onServerComboLostFocus(LLFocusableElement* fe, void*)
@@ -1097,11 +1141,31 @@ void LLPanelLogin::onSelectServer(LLUICtrl*, void*)
         // The user twiddled with the grid choice ui.
         // apply the selection to the grid setting.
         std::string grid_label;
-        S32 grid_index;
+        //S32 grid_index;
 
         LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
         LLSD combo_val = combo->getValue();
 
+        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());
+                        //platform->setCurrentByIndex(gridInfo->getPlatform());
+                        //childSetText("gridname", gridInfo->getGridName());
+                        LLPanelLogin::setFields( gridInfo->getFirstName(), gridInfo->getLastName(), gridInfo->getAvatarPassword(), 1 );
+                }
+        //gHippoGridManager->setCurrentGrid(mCurGrid);
+
+
+        
+                llwarns << "current grid = " << mCurGrid << llendl;
+
+        /*
+
         if (LLSD::TypeInteger == combo_val.type())
         {
                 grid_index = combo->getValue().asInteger();
@@ -1126,17 +1190,27 @@ void LLPanelLogin::onSelectServer(LLUICtrl*, void*)
         vl->resetURIs();
         if(grid_index != GRID_INFO_OTHER)
         {
-                vl->setGridChoice((EGridInfo)grid_index);
+                vl->setGridChoice(grid_index);
         }
         else
         {
                 vl->setGridChoice(grid_label);
         }
 
+        // 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*)
 {
         LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
@@ -1145,3 +1219,4 @@ void LLPanelLogin::onServerComboLostFocus(LLFocusableElement* fe, void*)
                 onSelectServer(combo, NULL);    
         }
 }
+*/