diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-06-20 16:11:33 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-06-20 16:11:33 -0400 |
| commit | a3066b7375a13b61861b554519673dfc24322c22 (patch) | |
| tree | 9b3d61c932ff8a88e5a2384f138e7ed9b83248ac /indra/newview/llviewermedia.cpp | |
| parent | f1e52656e9e328d66aa5050bc9e59948a0217283 (diff) | |
| parent | 124d8c8dce3a5da8aa73f12f8733c65f57479a24 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 4 |
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; |