Second Life viewer sources 1.23.0-RC

1 files changed, 25 insertions, 210 deletions

diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 64eecd6..bc5e8f2 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -32,6 +33,7 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llpanellogin.h"
+
 #include "llpanelgeneral.h"
 
 #include "indra_constants.h"            // for key and mask constants
@@ -43,7 +45,7 @@
 
 #include "llbutton.h"
 #include "llcheckboxctrl.h"
-#include "llcommandhandler.h"
+#include "llcommandhandler.h"           // for secondlife:///app/login/
 #include "llcombobox.h"
 #include "llcurl.h"
 #include "llviewercontrol.h"
@@ -78,9 +80,6 @@
 
 #define USE_VIEWER_AUTH 0
 
-std::string load_password_from_disk(void);
-void save_password_to_disk(const char* hashed_password);
-
 const S32 BLACK_BORDER_HEIGHT = 160;
 const S32 MAX_PASSWORD = 16;
 
@@ -92,8 +91,8 @@ class LLLoginRefreshHandler : public LLCommandHandler
 {
 public:
         // don't allow from external browsers
-        LLLoginRefreshHandler() : LLCommandHandler("login_refresh", false) { }
-        bool handle(const LLSD& tokens, const LLSD& queryMap)
+        LLLoginRefreshHandler() : LLCommandHandler("login_refresh", true) { }
+        bool handle(const LLSD& tokens, const LLSD& query_map, LLWebBrowserCtrl* web)
         {       
                 if (LLStartUp::getStartupState() < STATE_LOGIN_CLEANUP)
                 {
@@ -106,191 +105,6 @@ public:
 LLLoginRefreshHandler gLoginRefreshHandler;
 
 
-//parses the input url and returns true if afterwards
-//a web-login-key, firstname and lastname  is set
-bool LLLoginHandler::parseDirectLogin(std::string url)
-{
-        LLURI uri(url);
-        parse(uri.queryMap());
-
-        if (mWebLoginKey.isNull() ||
-                mFirstName.empty() ||
-                mLastName.empty())
-        {
-                return false;
-        }
-        else
-        {
-                return true;
-        }
-}
-
-
-void LLLoginHandler::parse(const LLSD& queryMap)
-{
-        mWebLoginKey = queryMap["web_login_key"].asUUID();
-        mFirstName = queryMap["first_name"].asString();
-        mLastName = queryMap["last_name"].asString();
-        
-        EGridInfo grid_choice = GRID_INFO_NONE;
-        if (queryMap["grid"].asString() == "aditi")
-        {
-                grid_choice = GRID_INFO_ADITI;
-        }
-        else if (queryMap["grid"].asString() == "agni")
-        {
-                grid_choice = GRID_INFO_AGNI;
-        }
-        else if (queryMap["grid"].asString() == "siva")
-        {
-                grid_choice = GRID_INFO_SIVA;
-        }
-        else if (queryMap["grid"].asString() == "damballah")
-        {
-                grid_choice = GRID_INFO_DAMBALLAH;
-        }
-        else if (queryMap["grid"].asString() == "durga")
-        {
-                grid_choice = GRID_INFO_DURGA;
-        }
-        else if (queryMap["grid"].asString() == "shakti")
-        {
-                grid_choice = GRID_INFO_SHAKTI;
-        }
-        else if (queryMap["grid"].asString() == "soma")
-        {
-                grid_choice = GRID_INFO_SOMA;
-        }
-        else if (queryMap["grid"].asString() == "ganga")
-        {
-                grid_choice = GRID_INFO_GANGA;
-        }
-        else if (queryMap["grid"].asString() == "vaak")
-        {
-                grid_choice = GRID_INFO_VAAK;
-        }
-        else if (queryMap["grid"].asString() == "uma")
-        {
-                grid_choice = GRID_INFO_UMA;
-        }
-        else if (queryMap["grid"].asString() == "mohini")
-        {
-                grid_choice = GRID_INFO_MOHINI;
-        }
-        else if (queryMap["grid"].asString() == "yami")
-        {
-                grid_choice = GRID_INFO_YAMI;
-        }
-        else if (queryMap["grid"].asString() == "nandi")
-        {
-                grid_choice = GRID_INFO_NANDI;
-        }
-        else if (queryMap["grid"].asString() == "mitra")
-        {
-                grid_choice = GRID_INFO_MITRA;
-        }
-        else if (queryMap["grid"].asString() == "radha")
-        {
-                grid_choice = GRID_INFO_RADHA;
-        }
-        else if (queryMap["grid"].asString() == "ravi")
-        {
-                grid_choice = GRID_INFO_RAVI;
-        }
-        else if (queryMap["grid"].asString() == "aruna")
-        {
-                grid_choice = GRID_INFO_ARUNA;
-        }
-        else if (queryMap["grid"].asString() == "bharati")
-        {
-                grid_choice = GRID_INFO_BHARATI;
-        }
-        else if (queryMap["grid"].asString() == "chandra")
-        {
-                grid_choice = GRID_INFO_CHANDRA;
-        }
-        else if (queryMap["grid"].asString() == "danu")
-        {
-                grid_choice = GRID_INFO_DANU;
-        }
-        else if (queryMap["grid"].asString() == "parvati")
-        {
-                grid_choice = GRID_INFO_PARVATI;
-        }
-        else if (queryMap["grid"].asString() == "skanda")
-        {
-                grid_choice = GRID_INFO_SKANDA;
-        }
-
-        if(grid_choice != GRID_INFO_NONE)
-        {
-                LLViewerLogin::getInstance()->setGridChoice(grid_choice);
-        }
-
-        std::string startLocation = queryMap["location"].asString();
-
-        if (startLocation == "specify")
-        {
-                LLURLSimString::setString(queryMap["region"].asString());
-        }
-        else if (startLocation == "home")
-        {
-                gSavedSettings.setBOOL("LoginLastLocation", FALSE);
-                LLURLSimString::setString(LLStringUtil::null);
-        }
-        else if (startLocation == "last")
-        {
-                gSavedSettings.setBOOL("LoginLastLocation", TRUE);
-                LLURLSimString::setString(LLStringUtil::null);
-        }
-}
-
-bool LLLoginHandler::handle(const LLSD& tokens,
-                                                  const LLSD& queryMap)
-{       
-        parse(queryMap);
-        
-        //if we haven't initialized stuff yet, this is 
-        //coming in from the GURL handler, just parse
-        if (STATE_FIRST == LLStartUp::getStartupState())
-        {
-                return true;
-        }
-        
-        std::string password = queryMap["password"].asString();
-
-        if (!password.empty())
-        {
-                gSavedSettings.setBOOL("RememberPassword", TRUE);
-
-                if (password.substr(0,3) != "$1$")
-                {
-                        LLMD5 pass((unsigned char*)password.c_str());
-                        char md5pass[33];               /* Flawfinder: ignore */
-                        pass.hex_digest(md5pass);
-                        password = ll_safe_string(md5pass, 32);
-                        save_password_to_disk(password.c_str());
-                }
-        }
-        else
-        {
-                save_password_to_disk(NULL);
-                gSavedSettings.setBOOL("RememberPassword", FALSE);
-        }
-                        
-
-        if  (LLStartUp::getStartupState() < STATE_LOGIN_CLEANUP)  //on splash page
-        {
-                if (mWebLoginKey.isNull()) {
-                        LLPanelLogin::loadLoginPage();
-                } else {
-                        LLStartUp::setStartupState( STATE_LOGIN_CLEANUP );
-                }
-        }
-        return true;
-}
-
-LLLoginHandler gLoginHandler;
 
 // helper class that trys to download a URL from a web site and calls a method 
 // on parent class indicating if the web server is working or not
@@ -450,7 +264,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
                 LL_VERSION_PATCH,
                 LL_VIEWER_BUILD );
         LLTextBox* channel_text = getChild<LLTextBox>("channel_text");
-        channel_text->setTextArg("[CHANNEL]", channel);
+        channel_text->setTextArg("[CHANNEL]", channel); // though not displayed
         channel_text->setTextArg("[VERSION]", version);
         channel_text->setClickedCallback(onClickVersion);
         channel_text->setCallbackUserData(this);
@@ -465,7 +279,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
         // get the web browser control
         LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("login_html");
         // Need to handle login secondlife:///app/ URLs
-        web_browser->setOpenAppSLURLs( true );
+        web_browser->setTrusted( true );
 
         // observe browser events
         web_browser->addObserver( this );
@@ -732,8 +546,9 @@ void LLPanelLogin::show(const LLRect &rect,
 }
 
 // static
-void LLPanelLogin::setFields(const std::string& firstname, const std::string& lastname, const std::string& password,
-                                                         BOOL remember)
+void LLPanelLogin::setFields(const std::string& firstname,
+                             const std::string& lastname,
+                             const std::string& password)
 {
         if (!sInstance)
         {
@@ -767,8 +582,6 @@ void LLPanelLogin::setFields(const std::string& firstname, const std::string& la
                 pass.hex_digest(munged_password);
                 sInstance->mMungedPassword = munged_password;
         }
-
-        sInstance->childSetValue("remember_check", remember);
 }
 
 
@@ -787,8 +600,9 @@ void LLPanelLogin::addServer(const std::string& server, S32 domain_name)
 }
 
 // static
-void LLPanelLogin::getFields(std::string &firstname, std::string &lastname, std::string &password,
-                                                        BOOL &remember)
+void LLPanelLogin::getFields(std::string *firstname,
+                             std::string *lastname,
+                             std::string *password)
 {
         if (!sInstance)
         {
@@ -796,14 +610,13 @@ void LLPanelLogin::getFields(std::string &firstname, std::string &lastname, std:
                 return;
         }
 
-        firstname = sInstance->childGetText("first_name_edit");
-        LLStringUtil::trim(firstname);
+        *firstname = sInstance->childGetText("first_name_edit");
+        LLStringUtil::trim(*firstname);
 
-        lastname = sInstance->childGetText("last_name_edit");
-        LLStringUtil::trim(lastname);
+        *lastname = sInstance->childGetText("last_name_edit");
+        LLStringUtil::trim(*lastname);
 
-        password = sInstance->mMungedPassword;
-        remember = sInstance->childGetValue("remember_check");
+        *password = sInstance->mMungedPassword;
 }
 
 // static
@@ -1086,16 +899,17 @@ void LLPanelLogin::onClickConnect(void *)
                 }
                 else
                 {
-                        gViewerWindow->alertXml("MustHaveAccountToLogIn",
-                                                                        LLPanelLogin::newAccountAlertCallback);
+                        LLNotifications::instance().add("MustHaveAccountToLogIn", LLSD(), LLSD(),
+                                                                                LLPanelLogin::newAccountAlertCallback);
                 }
         }
 }
 
 
 // static
-void LLPanelLogin::newAccountAlertCallback(S32 option, void*)
+bool LLPanelLogin::newAccountAlertCallback(const LLSD& notification, const LLSD& response)
 {
+        S32 option = LLNotification::getSelectedOption(notification, response);
         if (0 == option)
         {
                 llinfos << "Going to account creation URL" << llendl;
@@ -1105,6 +919,7 @@ void LLPanelLogin::newAccountAlertCallback(S32 option, void*)
         {
                 sInstance->setFocus(TRUE);
         }
+        return false;
 }
 
 
@@ -1151,7 +966,7 @@ void LLPanelLogin::onPassKey(LLLineEditor* caller, void* user_data)
 {
         if (gKeyboard->getKeyDown(KEY_CAPSLOCK) && sCapslockDidNotification == FALSE)
         {
-                LLNotifyBox::showXml("CapsKeyOn");
+                LLNotifications::instance().add("CapsKeyOn");
                 sCapslockDidNotification = TRUE;
         }
 }