diff options
author | Armin Weatherwax | 2009-06-26 09:39:58 +0200 |
---|---|---|
committer | Armin Weatherwax | 2009-07-11 13:42:35 +0200 |
commit | 7067b31a6114089217e482bfecc58fd56bed4272 (patch) | |
tree | e0bb99a42c64cdb75e9ca15a38bc1171377c7739 /linden/indra/newview/llpanellogin.h | |
parent | Updated URL for Mac OpenAL libs package. (diff) | |
download | meta-impy-7067b31a6114089217e482bfecc58fd56bed4272.zip meta-impy-7067b31a6114089217e482bfecc58fd56bed4272.tar.gz meta-impy-7067b31a6114089217e482bfecc58fd56bed4272.tar.bz2 meta-impy-7067b31a6114089217e482bfecc58fd56bed4272.tar.xz |
BROKEN logoff/relog crashing inconsistently on various startup states.
Diffstat (limited to 'linden/indra/newview/llpanellogin.h')
-rw-r--r-- | linden/indra/newview/llpanellogin.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h index a303e32..8a9747b 100644 --- a/linden/indra/newview/llpanellogin.h +++ b/linden/indra/newview/llpanellogin.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2002&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2002&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2002-2009, Linden Research, Inc. | 7 | * Copyright (c) 2002-2008, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -60,6 +60,7 @@ class LLLoginHandler : public LLCommandHandler | |||
60 | LLUUID mWebLoginKey; | 60 | LLUUID mWebLoginKey; |
61 | std::string mFirstName; | 61 | std::string mFirstName; |
62 | std::string mLastName; | 62 | std::string mLastName; |
63 | std::string mPassword; | ||
63 | }; | 64 | }; |
64 | 65 | ||
65 | extern LLLoginHandler gLoginHandler; | 66 | extern LLLoginHandler gLoginHandler; |
@@ -86,8 +87,7 @@ public: | |||
86 | static void setFields(const std::string& firstname, const std::string& lastname, | 87 | static void setFields(const std::string& firstname, const std::string& lastname, |
87 | const std::string& password, BOOL remember); | 88 | const std::string& password, BOOL remember); |
88 | 89 | ||
89 | static void addServer(const std::string& server, S32 domain_name); | 90 | static void addServer(const std::string& server); |
90 | static void setServer(S32 domain_name); | ||
91 | static void refreshLocation( bool force_visible ); | 91 | static void refreshLocation( bool force_visible ); |
92 | 92 | ||
93 | static void getFields(std::string& firstname, std::string& lastname, | 93 | static void getFields(std::string& firstname, std::string& lastname, |
@@ -101,12 +101,14 @@ public: | |||
101 | void setSiteIsAlive( bool alive ); | 101 | void setSiteIsAlive( bool alive ); |
102 | 102 | ||
103 | static void loadLoginPage(); | 103 | static void loadLoginPage(); |
104 | static void refreshLoginPage(); | ||
104 | static void giveFocus(); | 105 | static void giveFocus(); |
105 | static void setAlwaysRefresh(bool refresh); | 106 | static void setAlwaysRefresh(bool refresh); |
106 | static void mungePassword(LLUICtrl* caller, void* user_data); | 107 | static void mungePassword(LLUICtrl* caller, void* user_data); |
107 | 108 | ||
108 | private: | 109 | private: |
109 | static void onClickConnect(void*); | 110 | static void onClickConnect(void*); |
111 | static void onClickGrid(void*); | ||
110 | static void onClickNewAccount(void*); | 112 | static void onClickNewAccount(void*); |
111 | static void newAccountAlertCallback(S32 option, void*); | 113 | static void newAccountAlertCallback(S32 option, void*); |
112 | static void onClickQuit(void*); | 114 | static void onClickQuit(void*); |