diff --git a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp
index 0bd323eb58d8f0754ca0aa28565ba8d2d8d0ee12..ebcdde2960f26b18dc6341105838e3e5d993c441 100644
--- a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp
+++ b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp
@@ -84,6 +84,7 @@ class MediaPluginLibVLC :
 
 	float mCurTime;
 	float mDuration;
+	EStatus mVlcStatus;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -111,6 +112,7 @@ MediaPluginBase(host_send_func, host_user_data)
 
 	mURL = std::string();
 
+	mVlcStatus = STATUS_NONE;
 	setStatus(STATUS_NONE);
 }
 
@@ -209,28 +211,28 @@ void MediaPluginLibVLC::eventCallbacks(const libvlc_event_t* event, void* ptr)
 	switch (event->type)
 	{
 	case libvlc_MediaPlayerOpening:
-		parent->setStatus(STATUS_LOADING);
+		parent->mVlcStatus = STATUS_LOADING;
 		break;
 
 	case libvlc_MediaPlayerPlaying:
 		parent->mDuration = (float)(libvlc_media_get_duration(parent->mLibVLCMedia)) / 1000.0f;
-		parent->setStatus(STATUS_PLAYING);
+		parent->mVlcStatus = STATUS_PLAYING;
 		break;
 
 	case libvlc_MediaPlayerPaused:
-		parent->setStatus(STATUS_PAUSED);
+		parent->mVlcStatus = STATUS_PAUSED;
 		break;
 
 	case libvlc_MediaPlayerStopped:
-		parent->setStatus(STATUS_DONE);
+		parent->mVlcStatus = STATUS_DONE;
 		break;
 
 	case libvlc_MediaPlayerEndReached:
-		parent->setStatus(STATUS_DONE);
+		parent->mVlcStatus = STATUS_DONE;
 		break;
 
 	case libvlc_MediaPlayerEncounteredError:
-		parent->setStatus(STATUS_ERROR);
+		parent->mVlcStatus = STATUS_ERROR;
 		break;
 
 	case libvlc_MediaPlayerTimeChanged:
@@ -446,6 +448,7 @@ void MediaPluginLibVLC::receiveMessage(const char* message_string)
 			}
 			else if (message_name == "idle")
 			{
+				setStatus(mVlcStatus);
 			}
 			else if (message_name == "cleanup")
 			{
@@ -567,7 +570,7 @@ void MediaPluginLibVLC::receiveMessage(const char* message_string)
 				{
 					if (mLibVLCMediaPlayer)
 					{
-						libvlc_media_player_pause(mLibVLCMediaPlayer);
+						libvlc_media_player_set_pause(mLibVLCMediaPlayer, 1);
 					}
 				}
 				else if (message_name == "seek")
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index ec06cc432f1cf26ebb2e01784b3262851ee487c8..bf98650afd9c3935e8dfdefcdc62fe7a4a22d828 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -810,7 +810,7 @@ void LLViewerMedia::updateMedia(void *dummy_arg)
 				sAnyMediaShowing = true;
 			}
 
-			if (!pimpl->getUsedInUI() && pimpl->hasMedia() && (!pimpl->isMediaPaused() || !pimpl->isMediaTimeBased()))
+			if (!pimpl->getUsedInUI() && pimpl->hasMedia() && pimpl->isMediaPlaying())
 			{
 				sAnyMediaPlaying = true;
 			}
@@ -949,7 +949,6 @@ void LLViewerMedia::setAllMediaPaused(bool val)
                 if (pimpl->isMediaTimeBased() && pimpl->isMediaPaused())
                 {
                     pimpl->play();
-                    return;
                 }
             }
             else if (pimpl->isMediaTimeBased() && pimpl->mMediaSource)