Merge downstream code and become 3.7.18

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())