diff options
author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-22 16:28:45 +0200 |
---|---|---|
committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-22 16:28:45 +0200 |
commit | 5f334e18b837493f9c6f7a62eb61f0aeec94d28b (patch) | |
tree | 048347781b2f7adf0c1a20b2c2033400c7ab203b /indra/newview/llviewermedia.cpp | |
parent | 7f42a0e8affe1a3394116d1457830f774deb7438 (diff) | |
parent | 1fb9389822405bae537d7203cd56ffee5f717664 (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rw-r--r-- | indra/newview/llviewermedia.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 04d67fe750..d712446d83 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -752,6 +752,11 @@ void LLViewerMedia::updateMedia(void *dummy_arg) new_priority = LLPluginClassMedia::PRIORITY_NORMAL; impl_count_interest_normal++; } + else if(pimpl->isParcelMedia()) + { + new_priority = LLPluginClassMedia::PRIORITY_NORMAL; + impl_count_interest_normal++; + } else { // Look at interest and CPU usage for instances that aren't in any of the above states. |