diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-04-14 23:17:53 +0300 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-04-14 23:17:53 +0300 |
commit | 46a34fe0ee11ac261431604dbb3de31bca98e16d (patch) | |
tree | 73c814f887e43b215ad62c1c52eafe0e035d2415 /indra/newview/llviewermedia.cpp | |
parent | a1b5593d15841c4d1b63316392ce0149552d4979 (diff) | |
parent | 7de3a6e81971cb239ec4691e37e6718ecabd00d8 (diff) |
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rwxr-xr-x | indra/newview/llviewermedia.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 3e027e3d05..a7ad7c80d9 100755 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1312,6 +1312,13 @@ void LLViewerMedia::getOpenIDCookieCoro(std::string url) if (parseRawCookie(sOpenIDCookie, cookie_name, cookie_value, cookie_path, httponly, secure) && media_instance->getMediaPlugin()) { + // MAINT-5711 - inexplicably, the CEF setCookie function will no longer set the cookie if the + // url and domain are not the same. This used to be my.sl.com and id.sl.com respectively and worked. + // For now, we use the URL for the OpenID POST request since it will have the same authority + // as the domain field. + // (Feels like there must be a less dirty way to construct a URL from component LLURL parts) + url = std::string(sOpenIDURL.mURI) + "://" + std::string(sOpenIDURL.mAuthority); + media_instance->getMediaPlugin()->setCookie(url, cookie_name, cookie_value, cookie_host, cookie_path, httponly, secure); } } |