diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 434c8f1d8c6cddd939bec1abe2dac869666cea81..9f05ee61bde4c3ddd0f52586842890ef8efc7be2 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -810,8 +810,9 @@ void LLViewerMedia::updateMedia(void *dummy_arg)
 				sAnyMediaShowing = true;
 			}
 
-			if (!pimpl->getUsedInUI() && pimpl->hasMedia() && pimpl->isMediaPlaying())
+			if (!pimpl->getUsedInUI() && pimpl->hasMedia() && (pimpl->isMediaPlaying() || !pimpl->isMediaTimeBased()))
 			{
+				// consider visible non-timebased media as playing
 				sAnyMediaPlaying = true;
 			}
 
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index 5c876861c45fa5e6cecd4642f05f03d819888ead..0212bf88bf7514bffd332428b7dbc77885a474d7 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -105,10 +105,11 @@ class LLViewerMedia
 	
 	// Is any media currently "showing"?  Includes Parcel Media.  Does not include media in the UI.
 	static bool isAnyMediaShowing();
+	// Shows if any media is playing, counts visible non time based media as playing. Does not include media in the UI.
 	static bool isAnyMediaPlaying();
 	// Set all media enabled or disabled, depending on val.   Does not include media in the UI.
 	static void setAllMediaEnabled(bool val);
-	// Set all media paused or playing, depending on val.   Does not include media in the UI.
+	// Set all media paused(stopped for non time based) or playing, depending on val.   Does not include media in the UI.
 	static void setAllMediaPaused(bool val);
 
 	static void updateMedia(void* dummy_arg = NULL);