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.cpp | |
| parent | 311aaf7ffd8f7dc95dba84f10fcae97bc93901bb (diff) | |
DEV-34822 - merge 1.23
merge -r119443 - basic slurl handling
ignore dead branch
Diffstat (limited to 'indra/newview/llloginhandler.cpp')
| -rw-r--r-- | indra/newview/llloginhandler.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/indra/newview/llloginhandler.cpp b/indra/newview/llloginhandler.cpp index 7d43f6a8cc..482660459e 100644 --- a/indra/newview/llloginhandler.cpp +++ b/indra/newview/llloginhandler.cpp @@ -38,7 +38,7 @@ #include "llsecapi.h" #include "llpanellogin.h" // save_password_to_disk() #include "llstartup.h" // getStartupState() -#include "llurlsimstring.h" +#include "llslurl.h" #include "llviewercontrol.h" // gSavedSettings #include "llviewernetwork.h" // EGridInfo #include "llviewerwindow.h" // getWindow() @@ -69,7 +69,7 @@ void LLLoginHandler::parse(const LLSD& queryMap) if (queryMap.has("grid")) { - LLGridManager::getInstance()->setGridChoice(queryMap["grid"].asString()); + LLGridManager::getInstance()->setGridChoice(queryMap["grid"].asString()); } @@ -77,11 +77,16 @@ void LLLoginHandler::parse(const LLSD& queryMap) if (startLocation == "specify") { - LLURLSimString::setString(queryMap["region"].asString()); + LLStartUp::setStartSLURL(LLSLURL(LLGridManager::getInstance()->getGridID(), + queryMap["region"].asString())); } - else if (!startLocation.empty()) + else if (startLocation == "home") { - LLURLSimString::setString(startLocation); + LLStartUp::setStartSLURL(LLSLURL(LLSLURL::SIM_LOCATION_HOME)); + } + else if (startLocation == "last") + { + LLStartUp::setStartSLURL(LLSLURL(LLSLURL::SIM_LOCATION_LAST)); } } @@ -153,12 +158,9 @@ bool LLLoginHandler::handle(const LLSD& tokens, // ones from the protected credential store. // This always returns with a credential structure set in the // login handler -LLPointer<LLCredential> LLLoginHandler::initializeLoginInfo(const std::string& url) +LLPointer<LLCredential> LLLoginHandler::initializeLoginInfo() { - LLURI uri(url); LLPointer<LLCredential> result = NULL; - parse(uri.queryMap()); - // we weren't able to parse login info from the slurl, // so try to load it from the UserLoginInfo result = loadSavedUserLoginInfo(); if (result.isNull()) |