diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-10 10:55:33 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-10 10:55:33 -0800 |
| commit | ecc02f34201bc3ae0240da2365384e4f08854355 (patch) | |
| tree | d3704b6823aacf4552a438f6477666b656c60c0a /indra/newview/llloginhandler.cpp | |
| parent | e349c33fa91505f944bd0e24a5e3a26a5f51197f (diff) | |
| parent | bc852b9a5dcffcec4cbf15b5cc4e571f8970c125 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llloginhandler.cpp')
| -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") { |