livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHOP-245 removed crufty secondlife.com/app/login url and the dubious code that used it. Rev by Brad

meow-7.2.2
Mark Palange (Mani) 2010-12-10 16:19:44 -08:00
parent a738de7d56
commit 6c21e9262e
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llpanellogin.cpp
View File

@ -425,11 +425,13 @@ void LLPanelLogin::giveFocus()
// static
void LLPanelLogin::showLoginWidgets()
{
// *NOTE: Mani - This may or may not be obselete code.
// 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 = sInstance->getString("real_url");
std::string splash_screen_url = LLGridManager::getInstance()->getLoginPage();
web_browser->navigateTo( splash_screen_url, "text/html" );
LLUICtrl* username_edit = sInstance->getChild<LLUICtrl>("username_edit");
username_edit->setFocus(TRUE);

6
indra/newview/skins/default/xui/en/panel_login.xml
View File

@ -11,11 +11,7 @@ top="600"
name="create_account_url">
http://join.secondlife.com/
</panel.string>
<panel.string
name="real_url" translate="false">
http://secondlife.com/app/login/
</panel.string>
<string name="reg_in_client_url" translate="false">
<string name="reg_in_client_url" translate="false">
http://secondlife.eniac15.lindenlab.com/reg-in-client/
</string>
<panel.string