diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2010-03-10 09:29:45 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2010-03-10 09:29:45 +0000 |
| commit | f99a86753e7adcff28b68601a530a4e478d088a8 (patch) | |
| tree | 7c8768c9d26d8b931c4597d864d1bbcac4464b4b | |
| parent | 50abb9b972be65178bab5bc6ca247148febda140 (diff) | |
| parent | 983d633a3c2d41cef1e6a85a1d6a7432f091012b (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
| -rw-r--r-- | indra/newview/llloginhandler.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llloginhandler.cpp b/indra/newview/llloginhandler.cpp index 1be3430e07..e3817eecc4 100644 --- a/indra/newview/llloginhandler.cpp +++ b/indra/newview/llloginhandler.cpp @@ -35,6 +35,7 @@ #include "llloginhandler.h" // viewer includes +#include "lllogininstance.h" // to check if logged in yet #include "llpanellogin.h" // save_password_to_disk() #include "llstartup.h" // getStartupState() #include "llurlsimstring.h" @@ -169,6 +170,13 @@ bool LLLoginHandler::handle(const LLSD& tokens, const LLSD& query_map, LLMediaCtrl* web) { + // do nothing if we are already logged in + if (LLLoginInstance::getInstance()->authSuccess()) + { + LL_WARNS_ONCE("SLURL") << "Already logged in! Ignoring login SLapp." << LL_ENDL; + return true; + } + if (tokens.size() == 1 && tokens[0].asString() == "show") { |