From 11f30bc28d79a9c325f98292b8a3a716f63e8869 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Sun, 16 Dec 2012 23:17:10 +0100 Subject: [PATCH] Removed gFullName which isn't used anywhere --- indra/newview/llpanellogin.cpp | 4 ---- indra/newview/llpanellogin.h | 8 -------- indra/newview/llstartup.cpp | 24 ------------------------ 3 files changed, 36 deletions(-) diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 019ddd668..134363bce 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -162,10 +162,6 @@ public: LLLoginRefreshHandler gLoginRefreshHandler; -// -std::string gFullName; -// - // 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 class LLIamHereLogin : public LLHTTPClient::ResponderHeadersOnly diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h index 53eb9b52d..1812b6fc7 100644 --- a/indra/newview/llpanellogin.h +++ b/indra/newview/llpanellogin.h @@ -41,10 +41,6 @@ class LLUIImage; class LLComboBox; -// -extern std::string gFullName; -// - class LLPanelLogin: public LLPanel, public LLViewerMediaObserver @@ -165,8 +161,4 @@ private: std::string load_password_from_disk(void); void save_password_to_disk(const char* hashed_password); -// -extern std::string gFullName; -// - #endif diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 6d1e2d92c..168685799 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -757,9 +757,6 @@ bool idle_startup() // We have at least some login information on a SLURL firstname = gLoginHandler.getFirstName(); lastname = gLoginHandler.getLastName(); - // - gFullName = utf8str_tolower(firstname + " " + lastname); - // web_login_key = gLoginHandler.getWebLoginKey(); // Show the login screen if we don't have everything @@ -771,9 +768,6 @@ bool idle_startup() LLSD cmd_line_login = gSavedSettings.getLLSD("UserLoginInfo"); firstname = cmd_line_login[0].asString(); lastname = cmd_line_login[1].asString(); - // - gFullName = utf8str_tolower(firstname + " " + lastname); - // LLMD5 pass((unsigned char*)cmd_line_login[2].asString().c_str()); char md5pass[33]; /* Flawfinder: ignore */ @@ -791,9 +785,6 @@ bool idle_startup() { firstname = gSavedSettings.getString("FirstName"); lastname = gSavedSettings.getString("LastName"); - // - gFullName = utf8str_tolower(firstname + " " + lastname); - // password = LLStartUp::loadPasswordFromDisk(); gSavedSettings.setBOOL("RememberPassword", TRUE); @@ -809,9 +800,6 @@ bool idle_startup() // a valid grid is selected firstname = gSavedSettings.getString("FirstName"); lastname = gSavedSettings.getString("LastName"); - // - gFullName = utf8str_tolower(firstname + " " + lastname); - // password = LLStartUp::loadPasswordFromDisk(); show_connect_box = true; } @@ -895,9 +883,6 @@ bool idle_startup() else { LLPanelLogin::setFields(firstname, lastname, password); - // - gFullName = utf8str_tolower(firstname + " " + lastname); - // LLPanelLogin::giveFocus(); } display_startup(); @@ -969,9 +954,6 @@ bool idle_startup() { firstname = gLoginHandler.getFirstName(); lastname = gLoginHandler.getLastName(); - // - gFullName = utf8str_tolower(firstname + " " + lastname); - // web_login_key = gLoginHandler.getWebLoginKey(); } @@ -990,9 +972,6 @@ bool idle_startup() { gSavedSettings.setString("FirstName", firstname); gSavedSettings.setString("LastName", lastname); - // - gFullName = utf8str_tolower(firstname + " " + lastname); - // if (!gSavedSettings.controlExists("RememberLogin")) gSavedSettings.declareBOOL("RememberLogin", false, "Remember login", false); gSavedSettings.setBOOL("RememberLogin", LLPanelLogin::getRememberLogin()); @@ -4099,9 +4078,6 @@ bool process_login_success_response(std::string& password) if(!text.empty()) lastname.assign(text); gSavedSettings.setString("FirstName", firstname); gSavedSettings.setString("LastName", lastname); - // - gFullName = utf8str_tolower(firstname + " " + lastname); - // if (gSavedSettings.getBOOL("RememberPassword")) {