From 050ba45533502cd681c20184b37ae140cbadb114 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Fri, 20 Jun 2014 16:56:49 -0700 Subject: Fixing some merge screwups someone in the last 10,000 comnits --- indra/newview/llpanellogin.cpp | 2 +- indra/newview/llpanellogin.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview') 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("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); -- cgit v1.2.3