diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-01-22 14:55:39 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-01-22 14:55:39 -0500 |
| commit | 3b0ba0c2d7f48a5d1cf2adcbc87c9eaf4d8f6564 (patch) | |
| tree | dc2c080606407dc5f9f2c872d3dd40a465acecf8 /indra/newview/llviewermedia.cpp | |
| parent | 1f896d2d58d9c150d3981f253e81898afa999c2c (diff) | |
| parent | fa891c062ef66410123c66de1ef67b7dcef327db (diff) | |
automated merge viewer2.0->viewer2.0
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. |