Fixing some merge screwups someone in the last 10,000 comnits

2 files changed, 3 insertions, 1 deletions

diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 67ab7cd384..64bdcf7085 100755
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -445,7 +445,7 @@ void LLPanelLogin::showLoginWidgets()
 		// It seems to be part of the defunct? reg-in-client project.
 		sInstance->getChildView("login_widgets")->setVisible( true);
 		LLMediaCtrl* web_browser = sInstance->getChild<LLMediaCtrl>("login_html");
-		sInstance->reshapeBrowser();
+
 		// *TODO: Append all the usual login parameters, like first_login=Y etc.
 		std::string splash_screen_url = LLGridManager::getInstance()->getLoginPage();
 		web_browser->navigateTo( splash_screen_url, "text/html" );
diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h
index 0e68ae3ccf..aa63ffabfc 100755
--- a/indra/newview/llpanellogin.h
+++ b/indra/newview/llpanellogin.h
@@ -70,6 +70,8 @@ public:
 
 	void setSiteIsAlive( bool alive );
 
+	void showLoginWidgets();
+
 	static void loadLoginPage();	
 	static void giveFocus();
 	static void setAlwaysRefresh(bool refresh);