summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2009-12-03 11:34:53 -0800
committerMonroe Linden <monroe@lindenlab.com>2009-12-03 11:34:53 -0800
commitcfe5ac7684d40032c3d6c83742a64463bf0f15ad (patch)
treec2810ed48e04b87c75ce490b4be423db580125e4 /indra/newview
parent8752f020fc4dc3e605e361f824fcfd4eae4b2ab0 (diff)
Fix for DEV-43696 (media streams should have hard limit of 8)
This was just an off-by-one error in the hard limit calculation (> instead of >=).
Diffstat (limited to 'indra/newview')
-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