diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-01-21 15:39:14 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-01-21 15:39:14 -0800 |
| commit | 96721b3cccee96574695764871c8ac92ee5bb845 (patch) | |
| tree | e21696a488c7e4f6e54ecfe45c059e94829d3c00 | |
| parent | 6a686700d0f51c02facb645208b7e21aa9b687d9 (diff) | |
Partial fix for EXT-4508 (nearby media floater parcel media button breaks rtsp)
This is actually two seperate issues:
1) After disabling parcel media from the nearby media floater, it can't be re-enabled
2) When you disable parcel media from the nearby media floater, faces displaying it don't revert to their original texture
This change fixes issue (1), by forcing the priority of the inworld media instance to normal in LLViewerMedia::updateMedia() so it will always get reloaded instead of possibly being kept unloaded due to already-loaded prim media.
Issue (2) is still under investigation. In addition to the case where you disable parcel media from the nearby media floater, it also doesn't restore the textures when you leave the parcel, and I think I've even seen it when unloading
| -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. |