diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/lluserauth.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/linden/indra/newview/lluserauth.h b/linden/indra/newview/lluserauth.h index 869b235..b59c3f3 100644 --- a/linden/indra/newview/lluserauth.h +++ b/linden/indra/newview/lluserauth.h | |||
@@ -70,7 +70,7 @@ class LLXMLRPCTransaction; | |||
70 | // session-id = auth key | 70 | // session-id = auth key |
71 | //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 71 | //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
72 | 72 | ||
73 | class LLUserAuth | 73 | class LLUserAuth : public LLSingleton<LLUserAuth> |
74 | { | 74 | { |
75 | public: | 75 | public: |
76 | LLUserAuth(); | 76 | LLUserAuth(); |
@@ -104,7 +104,6 @@ public: | |||
104 | BOOL skip_optional_update, | 104 | BOOL skip_optional_update, |
105 | BOOL accept_tos, | 105 | BOOL accept_tos, |
106 | BOOL accept_critical_message, | 106 | BOOL accept_critical_message, |
107 | const LLUUID& viewer_digest, | ||
108 | BOOL last_exec_froze, | 107 | BOOL last_exec_froze, |
109 | const std::vector<const char*>& requested_options, | 108 | const std::vector<const char*>& requested_options, |
110 | const std::string& hashed_mac, | 109 | const std::string& hashed_mac, |
@@ -121,13 +120,15 @@ public: | |||
121 | BOOL skip_optional_update, | 120 | BOOL skip_optional_update, |
122 | BOOL accept_tos, | 121 | BOOL accept_tos, |
123 | BOOL accept_critical_message, | 122 | BOOL accept_critical_message, |
124 | const LLUUID& viewer_digest, | ||
125 | BOOL last_exec_froze, | 123 | BOOL last_exec_froze, |
126 | const std::vector<const char*>& requested_options, | 124 | const std::vector<const char*>& requested_options, |
127 | const std::string& hashed_mac, | 125 | const std::string& hashed_mac, |
128 | const std::string& hashed_volume_serial); | 126 | const std::string& hashed_volume_serial); |
129 | 127 | ||
130 | UserAuthcode authResponse(); | 128 | UserAuthcode authResponse(); |
129 | |||
130 | // clears out internal data cache. | ||
131 | void reset(); | ||
131 | 132 | ||
132 | std::string errorMessage() const { return mErrorMessage; } | 133 | std::string errorMessage() const { return mErrorMessage; } |
133 | 134 | ||
@@ -154,6 +155,4 @@ private: | |||
154 | F64 mLastTransferRateBPS; // bits per second, only valid after a big transfer like inventory | 155 | F64 mLastTransferRateBPS; // bits per second, only valid after a big transfer like inventory |
155 | }; | 156 | }; |
156 | 157 | ||
157 | extern LLUserAuth *gUserAuthp; | ||
158 | |||
159 | #endif /* LLUSERAUTH_H */ | 158 | #endif /* LLUSERAUTH_H */ |