diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-10-06 15:22:58 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-10-06 15:22:58 -0400 |
| commit | 99b2d7455467b126b0b6fd7ac3e7d0ef074000a6 (patch) | |
| tree | abe63f154c79c2583e644a77b7cfd2f0117bc632 /indra/newview/llloginhandler.cpp | |
| parent | f9c73f089a5a213e965aa59d6128ba5dd381186e (diff) | |
| parent | 788ce7a8cdbbbf98566ce75ec281ec00c21dc6d8 (diff) | |
Merge. Refresh from viewer-release after 3.7.17 release.
Diffstat (limited to 'indra/newview/llloginhandler.cpp')
| -rwxr-xr-x | indra/newview/llloginhandler.cpp | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/indra/newview/llloginhandler.cpp b/indra/newview/llloginhandler.cpp index 9b4f146332..39f3c0f113 100755 --- a/indra/newview/llloginhandler.cpp +++ b/indra/newview/llloginhandler.cpp @@ -96,33 +96,6 @@ bool LLLoginHandler::handle(const LLSD& tokens, return true; } - if (tokens.size() == 1 - && tokens[0].asString() == "show") - { - // We're using reg-in-client, so show the XUI login widgets - LLPanelLogin::showLoginWidgets(); - return true; - } - - if (tokens.size() == 1 - && tokens[0].asString() == "reg") - { - LLWindow* window = gViewerWindow->getWindow(); - window->incBusyCount(); - window->setCursor(UI_CURSOR_ARROW); - - // Do this first, as it may be slow and we want to keep something - // on the user's screen as long as possible - LLWeb::loadURLExternal( "http://join.eniac15.lindenlab.com/" ); - - window->decBusyCount(); - window->setCursor(UI_CURSOR_ARROW); - - // Then hide the window - window->minimize(); - return true; - } - // Make sure window is visible LLWindow* window = gViewerWindow->getWindow(); if (window->getMinimized()) |
