diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-04-30 16:01:36 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-04-30 16:01:36 -0700 |
| commit | 7eaae1fe819aef7dc8ac20387e62c3d13ab6d72f (patch) | |
| tree | 64448ec622eb8b4d4c40c1b43821bd8a9c5c4a08 /indra/newview/llviewermedia.cpp | |
| parent | 07c207346f63d464e45efe0be3aae64138982279 (diff) | |
| parent | 10b073413548db34ec4c6c6f6976414cd97f9954 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 076a9609e3..c6f8ce2e15 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -733,10 +733,17 @@ static bool proximity_comparitor(const LLViewerMediaImpl* i1, const LLViewerMedi } } +static LLFastTimer::DeclareTimer FTM_MEDIA_UPDATE("Update Media"); + ////////////////////////////////////////////////////////////////////////////////////////// // static void LLViewerMedia::updateMedia(void *dummy_arg) { + LLFastTimer t1(FTM_MEDIA_UPDATE); + + // Enable/disable the plugin read thread + LLPluginProcessParent::setUseReadThread(gSavedSettings.getBOOL("PluginUseReadThread")); + sAnyMediaShowing = false; sUpdatedCookies = getCookieStore()->getChangedCookies(); if(!sUpdatedCookies.empty()) |