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

get update llceflib with cookie/cache code and implement cache/cookie folders in viewer

meow-7.2.2
callum_linden 2015-09-01 17:43:30 -07:00
parent 1db2c7276d
commit 7505501aea
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
autobuild.xml
View File

@ -1536,11 +1536,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>ec98f409e9a2144f1ee3226d141a58c2</string>
<string>66f0127fcb3b2169a15fb09ae0387977</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llceflib_3p-llceflib/rev/304052/arch/Darwin/installer/llceflib-1.0.1.304052-darwin-304052.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llceflib_3p-llceflib/rev/304745/arch/Darwin/installer/llceflib-1.0.1.304745-darwin-304745.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@ -1550,18 +1550,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>f0874ffdbf023589a1bd2ddb4b0fe239</string>
<string>beff3d2db9cfac56e8e6c2ceabfa10f1</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llceflib_3p-llceflib/rev/304052/arch/CYGWIN/installer/llceflib-1.0.1.304052-windows-304052.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llceflib_3p-llceflib/rev/304745/arch/CYGWIN/installer/llceflib-1.0.1.304745-windows-304745.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
<string>1.0.1.304052</string>
<string>1.0.1.304745</string>
</map>
<key>llphysicsextensions_source</key>
<map>

16
indra/media_plugins/cef/media_plugin_cef.cpp
View File

@ -83,6 +83,8 @@ private:
std::string mAuthUsername;
std::string mAuthPassword;
bool mAuthOK;
std::string mCachePath;
std::string mCookiePath;
LLCEFLib* mLLCEFLib;
};
@ -104,6 +106,8 @@ MediaPluginBase(host_send_func, host_user_data)
mAuthUsername = "";
mAuthPassword = "";
mAuthOK = false;
mCachePath = "";
mCookiePath = "";
mLLCEFLib = new LLCEFLib();
}
@ -338,6 +342,8 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
settings.plugins_enabled = mPluginsEnabled;
settings.javascript_enabled = mJavascriptEnabled;
settings.cookies_enabled = mCookiesEnabled;
settings.cache_path = mCachePath;
settings.cookie_store_path = mCookiePath;
settings.accept_language_list = mHostLanguage;
settings.user_agent_substring = mUserAgentSubtring;
@ -363,6 +369,16 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
message.setValueBoolean("coords_opengl", false);
sendMessage(message);
}
else if (message_name == "set_user_data_path")
{
std::string user_data_path = message_in.getValue("path"); // n.b. always has trailing platform-specific dir-delimiter
mCachePath = user_data_path + "cef_cache";
mCookiePath = user_data_path + "cef_cookies";
std::stringstream str;
str << "@@@@@@@@@@ setting data paths to " << mCachePath << " and " << mCookiePath;
postDebugMessage(str.str());
}
else if (message_name == "size_change")
{
std::string name = message_in.getValue("name");