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

Fixed for MAINT-7201, MAINT-7202, MAINT-7203 (viewer-embeddedd browser scheme handler was broken)

master
Callum Prentice 2017-03-14 15:28:56 -07:00
parent c1f7c00869
commit f0b5a263c1
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
autobuild.xml
View File

@ -526,9 +526,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>6b1286d14e4717cfb3d9d4fb64a7c8e6</string>
<string>1517ca15cd1209b0910a8f6720c65cb4</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/3402/8535/dullahan-1.1.631_3.2987.1591.gd3e47f5-darwin64-503391.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/3408/8552/dullahan-1.1.636_3.2987.1591.gd3e47f5-darwin64-503397.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@ -538,9 +538,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>aa4506d7560f0d62169c755812dd9dc9</string>
<string>5dc1349abce3ccb04c6ac79a0ff19d59</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/3403/8541/dullahan-1.1.631_3.2987.1591.gd3e47f5-windows-503391.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/3410/8559/dullahan-1.1.636_3.2987.1591.gd3e47f5-windows-503397.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -550,16 +550,16 @@
<key>archive</key>
<map>
<key>hash</key>
<string>4b9ce6144b1c9d8c0bd5e0887092956b</string>
<string>928db398436823aa804046de91339177</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/3404/8546/dullahan-1.1.631_3.2987.1591.gd3e47f5-windows64-503391.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/3409/8562/dullahan-1.1.636_3.2987.1591.gd3e47f5-windows64-503397.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>1.1.631_3.2987.1591.gd3e47f5</string>
<string>1.1.636_3.2987.1591.gd3e47f5</string>
</map>
<key>elfio</key>
<map>

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

@ -512,6 +512,9 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
settings.user_agent_substring = mCEFLib->makeCompatibleUserAgentString(mUserAgentSubtring);
settings.webgl_enabled = true;
std::vector<std::string> custom_schemes(1, "secondlife");
mCEFLib->setCustomSchemes(custom_schemes);
bool result = mCEFLib->init(settings);
if (!result)
{