Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed gFullName which isn't used anywhere

Browse Source
This commit is contained in:
Aleric Inglewood
2012-12-16 23:17:10 +01:00
parent c34f2941aa
commit 11f30bc28d
3 changed files with 0 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llpanellogin.cpp
View File

@@ -162,10 +162,6 @@ public:
LLLoginRefreshHandler gLoginRefreshHandler; LLLoginRefreshHandler gLoginRefreshHandler;
// <edit>
std::string gFullName;
// </edit>
// helper class that trys to download a URL from a web site and calls a method // 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 // on parent class indicating if the web server is working or not
class LLIamHereLogin : public LLHTTPClient::ResponderHeadersOnly class LLIamHereLogin : public LLHTTPClient::ResponderHeadersOnly

8
indra/newview/llpanellogin.h
View File

@@ -41,10 +41,6 @@
class LLUIImage; class LLUIImage;
class LLComboBox; class LLComboBox;
// <edit>
extern std::string gFullName;
// </edit>
class LLPanelLogin: class LLPanelLogin:
public LLPanel, public LLPanel,
public LLViewerMediaObserver public LLViewerMediaObserver
@@ -165,8 +161,4 @@ private:
std::string load_password_from_disk(void); std::string load_password_from_disk(void);
void save_password_to_disk(const char* hashed_password); void save_password_to_disk(const char* hashed_password);
// <edit>
extern std::string gFullName;
// </edit>
#endif #endif

24
indra/newview/llstartup.cpp
View File

@@ -757,9 +757,6 @@ bool idle_startup()
// We have at least some login information on a SLURL // We have at least some login information on a SLURL
firstname = gLoginHandler.getFirstName(); firstname = gLoginHandler.getFirstName();
lastname = gLoginHandler.getLastName(); lastname = gLoginHandler.getLastName();
// <edit>
gFullName = utf8str_tolower(firstname + " " + lastname);
// </edit>
web_login_key = gLoginHandler.getWebLoginKey(); web_login_key = gLoginHandler.getWebLoginKey();
// Show the login screen if we don't have everything // Show the login screen if we don't have everything
@@ -771,9 +768,6 @@ bool idle_startup()
LLSD cmd_line_login = gSavedSettings.getLLSD("UserLoginInfo"); LLSD cmd_line_login = gSavedSettings.getLLSD("UserLoginInfo");
firstname = cmd_line_login[0].asString(); firstname = cmd_line_login[0].asString();
lastname = cmd_line_login[1].asString(); lastname = cmd_line_login[1].asString();
// <edit>
gFullName = utf8str_tolower(firstname + " " + lastname);
// </edit>
LLMD5 pass((unsigned char*)cmd_line_login[2].asString().c_str()); LLMD5 pass((unsigned char*)cmd_line_login[2].asString().c_str());
char md5pass[33]; /* Flawfinder: ignore */ char md5pass[33]; /* Flawfinder: ignore */
@@ -791,9 +785,6 @@ bool idle_startup()
{ {
firstname = gSavedSettings.getString("FirstName"); firstname = gSavedSettings.getString("FirstName");
lastname = gSavedSettings.getString("LastName"); lastname = gSavedSettings.getString("LastName");
// <edit>
gFullName = utf8str_tolower(firstname + " " + lastname);
// </edit>
password = LLStartUp::loadPasswordFromDisk(); password = LLStartUp::loadPasswordFromDisk();
gSavedSettings.setBOOL("RememberPassword", TRUE); gSavedSettings.setBOOL("RememberPassword", TRUE);
@@ -809,9 +800,6 @@ bool idle_startup()
// a valid grid is selected // a valid grid is selected
firstname = gSavedSettings.getString("FirstName"); firstname = gSavedSettings.getString("FirstName");
lastname = gSavedSettings.getString("LastName"); lastname = gSavedSettings.getString("LastName");
// <edit>
gFullName = utf8str_tolower(firstname + " " + lastname);
// </edit>
password = LLStartUp::loadPasswordFromDisk(); password = LLStartUp::loadPasswordFromDisk();
show_connect_box = true; show_connect_box = true;
} }
@@ -895,9 +883,6 @@ bool idle_startup()
else else
{ {
LLPanelLogin::setFields(firstname, lastname, password); LLPanelLogin::setFields(firstname, lastname, password);
// <edit>
gFullName = utf8str_tolower(firstname + " " + lastname);
// </edit>
LLPanelLogin::giveFocus(); LLPanelLogin::giveFocus();
} }
display_startup(); display_startup();
@@ -969,9 +954,6 @@ bool idle_startup()
{ {
firstname = gLoginHandler.getFirstName(); firstname = gLoginHandler.getFirstName();
lastname = gLoginHandler.getLastName(); lastname = gLoginHandler.getLastName();
// <edit>
gFullName = utf8str_tolower(firstname + " " + lastname);
// </edit>
web_login_key = gLoginHandler.getWebLoginKey(); web_login_key = gLoginHandler.getWebLoginKey();
} }
@@ -990,9 +972,6 @@ bool idle_startup()
{ {
gSavedSettings.setString("FirstName", firstname); gSavedSettings.setString("FirstName", firstname);
gSavedSettings.setString("LastName", lastname); gSavedSettings.setString("LastName", lastname);
// <edit>
gFullName = utf8str_tolower(firstname + " " + lastname);
// </edit>
if (!gSavedSettings.controlExists("RememberLogin")) gSavedSettings.declareBOOL("RememberLogin", false, "Remember login", false); if (!gSavedSettings.controlExists("RememberLogin")) gSavedSettings.declareBOOL("RememberLogin", false, "Remember login", false);
gSavedSettings.setBOOL("RememberLogin", LLPanelLogin::getRememberLogin()); gSavedSettings.setBOOL("RememberLogin", LLPanelLogin::getRememberLogin());
@@ -4099,9 +4078,6 @@ bool process_login_success_response(std::string& password)
if(!text.empty()) lastname.assign(text); if(!text.empty()) lastname.assign(text);
gSavedSettings.setString("FirstName", firstname); gSavedSettings.setString("FirstName", firstname);
gSavedSettings.setString("LastName", lastname); gSavedSettings.setString("LastName", lastname);
// <edit>
gFullName = utf8str_tolower(firstname + " " + lastname);
// </edit>
if (gSavedSettings.getBOOL("RememberPassword")) if (gSavedSettings.getBOOL("RememberPassword"))
{ {