diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-05-30 15:29:27 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-05-30 15:29:27 -0700 |
| commit | c780f730fed7ed90bf7228fd42e9ea46b8bce1cc (patch) | |
| tree | 9a617520758cc01fcf0792a8bde24f3fee3e8612 /indra/newview/llpanellogin.cpp | |
| parent | 68b62747edb7073dd3f4975e2b38388ae80d801c (diff) | |
| parent | 4885c122eaf1b4e304ce598f308d806322efacfc (diff) | |
DD-92 : pull merge lindenlab/sunshine-external to get AISv3 work
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
| -rwxr-xr-x | indra/newview/llpanellogin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index e2b4d098e9..088eaa8e0d 100755 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -421,7 +421,7 @@ void LLPanelLogin::showLoginWidgets() 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" ); + web_browser->navigateTo( splash_screen_url, HTTP_CONTENT_TEXT_HTML ); LLUICtrl* username_combo = sInstance->getChild<LLUICtrl>("username_combo"); username_combo->setFocus(TRUE); } @@ -785,7 +785,7 @@ void LLPanelLogin::loadLoginPage() if (web_browser->getCurrentNavUrl() != login_uri.asString()) { LL_DEBUGS("AppInit") << "loading: " << login_uri << LL_ENDL; - web_browser->navigateTo( login_uri.asString(), "text/html" ); + web_browser->navigateTo( login_uri.asString(), HTTP_CONTENT_TEXT_HTML ); } } |