summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorCallum Prentice <callum@gmail.com>2017-04-19 13:22:32 -0700
committerCallum Prentice <callum@gmail.com>2017-04-19 13:22:32 -0700
commit45f67f4ed7922e87ae5dd471bd82506f1e2300da (patch)
treeeb7c6a06445ae3d8542b1b455bd1567318b82ced /indra/newview
parent510a7530969d9818a8ba7f82937afabc6403cc5f (diff)
Hopeful fix for MAINT-7220 Windows Error Message 'SLPlugin.exe has stopped working ' appears.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewermedia.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 9f05ee61bd..900075488f 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -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;