Commit ddbe9583 authored by AndreyL ProductEngine's avatar AndreyL ProductEngine
Browse files

Backed out changeset: a6398f90389a

parent a07b64d3
......@@ -580,9 +580,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>11362c72e1edae9c98e6cc40d378fd37</string>
<string>d7b0c8910632f50ae8d21c5d68cdaca8</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38952/328700/dullahan-1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80-darwin64-528086.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38862/328055/dullahan-1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157-darwin64-528032.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
......@@ -592,9 +592,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>0980cd50e5fed4e68ee78132e5c2e240</string>
<string>9237b8e73999b539a9b2466941d02b79</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38954/328712/dullahan-1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows-528086.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38863/328061/dullahan-1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157-windows-528032.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
......@@ -604,16 +604,16 @@
<key>archive</key>
<map>
<key>hash</key>
<string>dd072189ea40ed9fa0af0f2caef866ca</string>
<string>3aef2dad2664a535d561ab4b235944db</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38953/328705/dullahan-1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows64-528086.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38864/328065/dullahan-1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157-windows64-528032.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80</string>
<string>1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157</string>
</map>
<key>elfio</key>
<map>
......
......@@ -857,10 +857,12 @@ void LLPluginClassMedia::paste()
}
void LLPluginClassMedia::setUserDataPath(const std::string &user_data_path_cache,
const std::string &user_data_path_cookies,
const std::string &user_data_path_cef_log)
{
LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "set_user_data_path");
message.setValue("cache_path", user_data_path_cache);
message.setValue("cookies_path", user_data_path_cookies);
message.setValue("cef_log_file", user_data_path_cef_log);
bool cef_verbose_log = gSavedSettings.getBOOL("CefVerboseLog");
......
......@@ -195,7 +195,7 @@ class LLPluginClassMedia : public LLPluginProcessParentOwner
bool canPaste() const { return mCanPaste; };
// These can be called before init(), and they will be queued and sent before the media init message.
void setUserDataPath(const std::string &user_data_path_cache, const std::string &user_data_path_cef_log);
void setUserDataPath(const std::string &user_data_path_cache, const std::string &user_data_path_cookies, const std::string &user_data_path_cef_log);
void setLanguageCode(const std::string &language_code);
void setPluginsEnabled(const bool enabled);
void setJavascriptEnabled(const bool enabled);
......
......@@ -96,6 +96,7 @@ class MediaPluginCEF :
bool mCanCopy;
bool mCanPaste;
std::string mCachePath;
std::string mCookiePath;
std::string mCefLogFile;
bool mCefLogVerbose;
std::vector<std::string> mPickedFiles;
......@@ -127,6 +128,7 @@ MediaPluginBase(host_send_func, host_user_data)
mCanCopy = false;
mCanPaste = false;
mCachePath = "";
mCookiePath = "";
mCefLogFile = "";
mCefLogVerbose = false;
mPickedFiles.clear();
......@@ -507,6 +509,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
settings.background_color = 0xffffffff;
settings.cache_enabled = true;
settings.cache_path = mCachePath;
settings.cookie_store_path = mCookiePath;
settings.cookies_enabled = mCookiesEnabled;
settings.disable_gpu = mDisableGPU;
settings.flash_enabled = mPluginsEnabled;
......@@ -561,6 +564,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
std::string user_data_path_cookies = message_in.getValue("cookies_path");
mCachePath = user_data_path_cache + "cef_cache";
mCookiePath = user_data_path_cookies + "cef_cookies";
mCefLogFile = message_in.getValue("cef_log_file");
mCefLogVerbose = message_in.getValueBoolean("cef_verbose_log");
}
......
......@@ -1731,10 +1731,12 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
std::string launcher_name = gDirUtilp->getLLPluginLauncher();
std::string plugin_name = gDirUtilp->getLLPluginFilename(plugin_basename);
// cookies now are stored in the CEF cache directory too (no more control over their location)
std::string user_data_path_cache = gDirUtilp->getCacheDir(false);
user_data_path_cache += gDirUtilp->getDirDelimiter();
std::string user_data_path_cookies = gDirUtilp->getOSUserAppDir();
user_data_path_cookies += gDirUtilp->getDirDelimiter();
std::string user_data_path_cef_log = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "cef_log.txt");
// Fix for EXT-5960 - make browser profile specific to user (cache, cookies etc.)
......@@ -1745,9 +1747,8 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
std::string linden_user_dir = gDirUtilp->getLindenUserDir();
if ( ! linden_user_dir.empty() )
{
// cookies now are stored in the CEF cache directory too (no more control over their location)
user_data_path_cache = linden_user_dir;
user_data_path_cache += gDirUtilp->getDirDelimiter();
user_data_path_cookies = linden_user_dir;
user_data_path_cookies += gDirUtilp->getDirDelimiter();
};
// See if the plugin executable exists
......@@ -1766,7 +1767,7 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
{
media_source = new LLPluginClassMedia(owner);
media_source->setSize(default_width, default_height);
media_source->setUserDataPath(user_data_path_cache, user_data_path_cef_log);
media_source->setUserDataPath(user_data_path_cache, user_data_path_cookies, user_data_path_cef_log);
media_source->setLanguageCode(LLUI::getLanguage());
media_source->setZoomFactor(zoom_factor);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment