diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-07-15 10:17:06 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-07-15 10:17:06 -0700 |
| commit | f5c7d69317af103b5f5f762d7e0adb82f12a71b3 (patch) | |
| tree | 912bcdb50d55ff7aec6559ac4a3005921cb0ff8a /indra/newview | |
| parent | edec2d0559905d33907380d0b304b9e28f74082e (diff) | |
| parent | 050ba45533502cd681c20184b37ae140cbadb114 (diff) | |
Merge with head
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llpanellogin.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llpanellogin.h | 2 |
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); |