summaryrefslogtreecommitdiff
path: root/indra/newview/llpanellogin.cpp
diff options
context:
space:
mode:
authorcallum_linden <none@none>2014-06-20 16:56:49 -0700
committercallum_linden <none@none>2014-06-20 16:56:49 -0700
commit050ba45533502cd681c20184b37ae140cbadb114 (patch)
tree0f12d793af883c9ce94af68543e64c4a9da40056 /indra/newview/llpanellogin.cpp
parentf11dd1d8a3dc4ba9a3c23563126e11ee971e219f (diff)
Fixing some merge screwups someone in the last 10,000 comnits
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
-rwxr-xr-xindra/newview/llpanellogin.cpp2
1 files changed, 1 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" );