diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-03-24 01:26:23 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-03-24 01:26:23 -0400 |
| commit | bd95e64d3da1b90b37e88e31979cc8f227d5cc58 (patch) | |
| tree | fff84f4075cb34a3fdd589bf399e47bebb8bc17d /indra/newview/llloginhandler.cpp | |
| parent | 3ad56f22158dd2665204745af2171689f208cd7e (diff) | |
| parent | 00a97a4f95f644b1807d72cebce6dd6a7a1cf31e (diff) | |
Set hotfix build params for Release.
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") { |