Merged working branch of 1.2 into LL 1.23 merge

1 files changed, 104 insertions, 55 deletions

diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 8bb7152..feb85a7 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -36,6 +36,9 @@
 
 #include "llpanelgeneral.h"
 
+#include "hippoGridManager.h"
+#include "floaterlogin.h"
+
 #include "indra_constants.h"            // for key and mask constants
 #include "llfontgl.h"
 #include "llmd5.h"
@@ -65,17 +68,24 @@
 #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"
 
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e)
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 #define USE_VIEWER_AUTH 0
 
 const S32 BLACK_BORDER_HEIGHT = 160;
@@ -152,11 +162,6 @@ namespace {
         boost::intrusive_ptr< LLIamHereLogin > gResponsePtr = 0;
 };
 
-void set_start_location(LLUICtrl* ctrl, void* data)
-{
-    LLURLSimString::setString(ctrl->getValue().asString());
-}
-
 //---------------------------------------------------------------------------
 // Public methods
 //---------------------------------------------------------------------------
@@ -243,13 +248,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");
 
@@ -551,6 +556,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
@@ -594,7 +600,7 @@ void LLPanelLogin::setFields(const std::string& firstname,
 
 
 // static
-void LLPanelLogin::addServer(const std::string& server, S32 domain_name)
+void LLPanelLogin::addServer(const std::string& server)
 {
         if (!sInstance)
         {
@@ -602,17 +608,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
@@ -690,10 +708,27 @@ void LLPanelLogin::refreshLocation( bool force_visible )
         if ( ! force_visible )
                 show_start = gSavedSettings.getBOOL("ShowStartLocation");
 
+
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+// TODO-RLVa: figure out some way to make this work with RLV_EXTENSION_STARTLOCATION
+#ifndef RLV_EXTENSION_STARTLOCATION
+                if (rlv_handler_t::isEnabled())
+                {
+                        show_start = FALSE;
+                }
+#endif // RLV_EXTENSION_STARTLOCATION
+// [/RLVa:KB]
+
+
         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
 }
@@ -726,18 +761,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
@@ -772,11 +828,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());
 
 
@@ -915,7 +972,15 @@ void LLPanelLogin::onClickConnect(void *)
                 }
         }
 }
+}
 
+void LLPanelLogin::onClickGrid(void *)
+{
+        if (sInstance && sInstance->mCallback)
+        {
+                LoginFloater::newShow(std::string("Test"), false);
+        }
+}
 
 // static
 bool LLPanelLogin::newAccountAlertCallback(const LLSD& notification, const LLSD& response)
@@ -983,7 +1048,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*)
@@ -992,46 +1057,29 @@ 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();
 
-        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();
-        }
+        std::string mCurGrid = ctrl->getValue().asString();
+        //KOW
+        gHippoGridManager->setCurrentGrid(mCurGrid);
+        // 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 );
+        // }
 
-        // 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((EGridInfo)grid_index);
-        }
-        else
-        {
-                vl->setGridChoice(grid_label);
-        }
+        
+        llwarns << "current grid = " << mCurGrid << llendl;
 
         // grid changed so show new splash screen (possibly)
         loadLoginPage();
 }
-
+/*
 void LLPanelLogin::onServerComboLostFocus(LLFocusableElement* fe, void*)
 {
         LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
@@ -1040,3 +1088,4 @@ void LLPanelLogin::onServerComboLostFocus(LLFocusableElement* fe, void*)
                 onSelectServer(combo, NULL);    
         }
 }
+*/