From 2078125f9a251fd8084f7f6dcabf2263b7a98a2e Mon Sep 17 00:00:00 2001 From: Monroe Linden Date: Mon, 14 Dec 2009 16:44:22 -0800 Subject: 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. --- indra/newview/llviewermedia.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview') 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(); -- cgit v1.2.3