summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskolb <none@none>2009-12-03 14:40:53 -0800
committerskolb <none@none>2009-12-03 14:40:53 -0800
commitea7b5d312c65240a92fd2d78707e79d0f5594f37 (patch)
tree436b76106fdac62a371cfb8d0c55f7514f8364ad
parentfaa188322a72b86b6a167834a4d2cd664da112bc (diff)
parentcfe5ac7684d40032c3d6c83742a64463bf0f15ad (diff)
Merge
-rw-r--r--indra/newview/llviewermedia.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 858aab300b..f6db661489 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -674,7 +674,7 @@ void LLViewerMedia::updateMedia(void *dummy_arg)
LLPluginClassMedia::EPriority new_priority = LLPluginClassMedia::PRIORITY_NORMAL;
- if(pimpl->isForcedUnloaded() || (impl_count_total > (int)max_instances))
+ if(pimpl->isForcedUnloaded() || (impl_count_total >= (int)max_instances))
{
// Never load muted or failed impls.
// Hard limit on the number of instances that will be loaded at one time