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

Hopeful fix for MAINT-7220 Windows Error Message 'SLPlugin.exe has stopped working ' appears.

meow-7.2.2
Callum Prentice 2017-04-19 13:22:32 -07:00
parent 510a753096
commit 45f67f4ed7
5 changed files with 604 additions and 605 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>c3da21de753f30793a369c6a3dfaab07</string>
<string>9005fcda30e6659790e2fdfc27d4e2ee</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4090/11448/dullahan-1.1.651_3.2987.1591.gd3e47f5-darwin64-504079.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4384/12984/dullahan-1.1.764_3.2987.1591.gd3e47f5-darwin64-504373.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@ -538,9 +538,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>3aea0733d1f18aa69420a02b9e455b40</string>
<string>9c2abd5b606a5f0580c4cbb4e9aedfaa</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4091/11453/dullahan-1.1.651_3.2987.1591.gd3e47f5-windows-504079.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4385/12990/dullahan-1.1.764_3.2987.1591.gd3e47f5-windows-504373.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -550,16 +550,16 @@
<key>archive</key>
<map>
<key>hash</key>
<string>c52a90eaa74218ff954cd1f32d1960c9</string>
<string>9e6714e4c3286a0b268577300043d998</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4092/11459/dullahan-1.1.651_3.2987.1591.gd3e47f5-windows64-504079.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4386/12995/dullahan-1.1.764_3.2987.1591.gd3e47f5-windows64-504373.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>1.1.651_3.2987.1591.gd3e47f5</string>
<string>1.1.764_3.2987.1591.gd3e47f5</string>
</map>
<key>elfio</key>
<map>

2
indra/llplugin/llpluginmessagepipe.cpp
View File

@ -215,7 +215,7 @@ bool LLPluginMessagePipe::pumpOutput()
else if(APR_STATUS_IS_EOF(status))
{
// This is what we normally expect when a plugin exits.
LL_INFOS() << "Got EOF from plugin socket. " << LL_ENDL;
//LL_INFOS() << "Got EOF from plugin socket. " << LL_ENDL;
if(mOwner)
{

1171
indra/llplugin/llpluginprocesschild.cpp
View File

File diff suppressed because it is too large Load Diff

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

@ -96,12 +96,6 @@ private:
std::string mCookiePath;
std::string mPickedFile;
dullahan* mCEFLib;
U8 *mPopupBuffer;
U32 mPopupW;
U32 mPopupH;
U32 mPopupX;
U32 mPopupY;
};
////////////////////////////////////////////////////////////////////////////////
@ -131,18 +125,13 @@ MediaPluginBase(host_send_func, host_user_data)
mPickedFile = "";
mCEFLib = new dullahan();
mPopupBuffer = NULL;
mPopupW = 0;
mPopupH = 0;
mPopupX = 0;
mPopupY = 0;
}
////////////////////////////////////////////////////////////////////////////////
//
MediaPluginCEF::~MediaPluginCEF()
{
delete[] mPopupBuffer;
mCEFLib->shutdown();
}
////////////////////////////////////////////////////////////////////////////////
@ -217,10 +206,11 @@ void MediaPluginCEF::onLoadStartCallback()
//
void MediaPluginCEF::onRequestExitCallback()
{
mCEFLib->shutdown();
LLPluginMessage message("base", "goodbye");
sendMessage(message);
mDeleteMe = true;
//mCEFLib->shutdown();
}
////////////////////////////////////////////////////////////////////////////////

4
indra/newview/llviewermedia.cpp
View File

@ -604,7 +604,9 @@ void LLViewerMedia::updateMedia(void *dummy_arg)
LLPluginProcessParent::setUseReadThread(gSavedSettings.getBOOL("PluginUseReadThread"));
// HACK: we always try to keep a spare running webkit plugin around to improve launch times.
createSpareBrowserMediaSource();
// 2017-04-19 Removed CP - this doesn't appear to buy us much and consumes a lot of resources so
// removing it for now.
//createSpareBrowserMediaSource();
sAnyMediaShowing = false;
sAnyMediaPlaying = false;