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

SOCIAL-367 FIX HTTP Auth dialog does not indicate what server a user is entering a user name and password for in Webkit 4.7

meow-7.2.2
callum 2010-12-13 14:21:30 -08:00
parent 524fd399bb
commit 4bf715c512
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llmediactrl.cpp
View File

@ -1052,6 +1052,14 @@ void LLMediaCtrl::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
{
LLNotification::Params auth_request_params;
auth_request_params.name = "AuthRequest";
// pass in host name and realm for site (may be zero length but will always exist)
LLSD args;
LLURL raw_url( self->getAuthURL().c_str() );
args["HOST_NAME"] = raw_url.getAuthority();
args["REALM"] = self->getAuthRealm();
auth_request_params.substitutions = args;
auth_request_params.payload = LLSD().with("media_id", mMediaTextureID);
auth_request_params.functor.function = boost::bind(&LLViewerMedia::onAuthSubmit, _1, _2, mMediaSource->getMediaPlugin());
LLNotifications::instance().add(auth_request_params);

2
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -6577,7 +6577,7 @@ Mute everyone?
<notification
name="AuthRequest"
type="browser">
Enter user name and password to continue.
The site at &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;[REALM]&apos; requires a user name and password.
<form name="form">
<input name="username" type="text" text="User Name"/>
<input name="password" type="password" text="Password"/>