aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lluserauth.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/lluserauth.h')
-rw-r--r--linden/indra/newview/lluserauth.h22
1 files changed, 20 insertions, 2 deletions
diff --git a/linden/indra/newview/lluserauth.h b/linden/indra/newview/lluserauth.h
index 9494593..869b235 100644
--- a/linden/indra/newview/lluserauth.h
+++ b/linden/indra/newview/lluserauth.h
@@ -12,12 +12,12 @@
12 * ("GPL"), unless you have obtained a separate licensing agreement 12 * ("GPL"), unless you have obtained a separate licensing agreement
13 * ("Other License"), formally executed by you and Linden Lab. Terms of 13 * ("Other License"), formally executed by you and Linden Lab. Terms of
14 * the GPL can be found in doc/GPL-license.txt in this distribution, or 14 * the GPL can be found in doc/GPL-license.txt in this distribution, or
15 * online at http://secondlife.com/developers/opensource/gplv2 15 * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
16 * 16 *
17 * There are special exceptions to the terms and conditions of the GPL as 17 * There are special exceptions to the terms and conditions of the GPL as
18 * it is applied to this Source Code. View the full text of the exception 18 * it is applied to this Source Code. View the full text of the exception
19 * in the file doc/FLOSS-exception.txt in this software distribution, or 19 * in the file doc/FLOSS-exception.txt in this software distribution, or
20 * online at http://secondlife.com/developers/opensource/flossexception 20 * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
21 * 21 *
22 * By copying, modifying or distributing this software, you acknowledge 22 * By copying, modifying or distributing this software, you acknowledge
23 * that you have read and understood your obligations described above, 23 * that you have read and understood your obligations described above,
@@ -93,6 +93,7 @@ public:
93 typedef std::map<std::string, std::string> response_t; 93 typedef std::map<std::string, std::string> response_t;
94 typedef std::vector<response_t> options_t; 94 typedef std::vector<response_t> options_t;
95 95
96 // viewer auth version
96 void authenticate( 97 void authenticate(
97 const char* auth_uri, 98 const char* auth_uri,
98 const char* auth_method, 99 const char* auth_method,
@@ -109,6 +110,23 @@ public:
109 const std::string& hashed_mac, 110 const std::string& hashed_mac,
110 const std::string& hashed_volume_serial); 111 const std::string& hashed_volume_serial);
111 112
113 // legacy version
114 void authenticate(
115 const char* auth_uri,
116 const char* auth_method,
117 const char* firstname,
118 const char* lastname,
119 const char* password,
120 const char* start,
121 BOOL skip_optional_update,
122 BOOL accept_tos,
123 BOOL accept_critical_message,
124 const LLUUID& viewer_digest,
125 BOOL last_exec_froze,
126 const std::vector<const char*>& requested_options,
127 const std::string& hashed_mac,
128 const std::string& hashed_volume_serial);
129
112 UserAuthcode authResponse(); 130 UserAuthcode authResponse();
113 131
114 std::string errorMessage() const { return mErrorMessage; } 132 std::string errorMessage() const { return mErrorMessage; }