diff options
author | Roxanne Skelly <roxie@lindenlab.com> | 2009-07-09 20:56:23 +0000 |
---|---|---|
committer | Roxanne Skelly <roxie@lindenlab.com> | 2009-07-09 20:56:23 +0000 |
commit | 7a64aad1def1b0612addbf2e66c66db061d7e182 (patch) | |
tree | 2e011e8b58933e692c0cae738a4382a37e3e222b /indra/newview/llloginhandler.h | |
parent | 311aaf7ffd8f7dc95dba84f10fcae97bc93901bb (diff) |
DEV-34822 - merge 1.23
merge -r119443 - basic slurl handling
ignore dead branch
Diffstat (limited to 'indra/newview/llloginhandler.h')
-rw-r--r-- | indra/newview/llloginhandler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llloginhandler.h b/indra/newview/llloginhandler.h index ec2459c835..c15b998c91 100644 --- a/indra/newview/llloginhandler.h +++ b/indra/newview/llloginhandler.h @@ -51,7 +51,7 @@ class LLLoginHandler : public LLCommandHandler //LLUUID getWebLoginKey() const { return mWebLoginKey; } LLPointer<LLCredential> loadSavedUserLoginInfo(); - LLPointer<LLCredential> initializeLoginInfo(const std::string& url); + LLPointer<LLCredential> initializeLoginInfo(); private: void parse(const LLSD& queryMap); |