diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2009-12-14 16:44:22 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2009-12-14 16:44:22 -0800 |
| commit | 2078125f9a251fd8084f7f6dcabf2263b7a98a2e (patch) | |
| tree | 7f6e43c0a69304aad2a9f7bc5db340a304c65e7e /indra | |
| parent | 909a16e5200462285813abfa293a8001c684093a (diff) | |
Only do the "lowest interest loadable" calculation if we've already hit the PluginInstancesTotal cap. Otherwise, we always need to load the top media data item.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 1ad19db4d3..367c0c8343 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -829,7 +829,8 @@ void LLViewerMedia::updateMedia(void *dummy_arg) // Re-calculate this every time. sLowestLoadableImplInterest = 0.0f; - if(lowest_interest_loadable) + // Only do this calculation if we've hit the impl count limit -- up until that point we always need to load media data. + if(lowest_interest_loadable && (impl_count_total >= (int)max_instances)) { // Get the interest value of this impl's object for use by isInterestingEnough LLVOVolume *object = lowest_interest_loadable->getSomeObject(); |