Skip to content
Snippets Groups Projects
Commit 2ce7807c authored by Callum Prentice's avatar Callum Prentice
Browse files

Fix for EXT-5960 (Store media cookies per user rather than per viewer)

Reviewed by RN and MW
parent 458895a7
No related branches found
No related tags found
No related merge requests found
......@@ -1229,6 +1229,19 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
std::string user_data_path = gDirUtilp->getOSUserAppDir();
user_data_path += gDirUtilp->getDirDelimiter();
// Fix for EXT-5960 - make browser profile specific to user (cache, cookies etc.)
// If the linden username returned is blank, that can only mean we are
// at the login page displaying login Web page or Web browser test via Develop menu.
// In this case we just use whatever gDirUtilp->getOSUserAppDir() gives us (this
// is what we always used before this change)
std::string linden_user_dir = gDirUtilp->getLindenUserDir();
if ( ! linden_user_dir.empty() )
{
// gDirUtilp->getLindenUserDir() is whole path, not just Linden name
user_data_path = linden_user_dir;
user_data_path += gDirUtilp->getDirDelimiter();
};
// See if the plugin executable exists
llstat s;
if(LLFile::stat(launcher_name, &s))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment