Added setting to toggle autoplaying of prim media, independent of parcel media. Audio autoplay also now yieds to sounds being stopped via nearby media panel.

2013-07-11 20:53:12 -05:00
parent 8f3c1af82d
commit 6be6f488ba
8 changed files with 68 additions and 17 deletions
--- a/indra/newview/llviewermediafocus.cpp
+++ b/indra/newview/llviewermediafocus.cpp
@@ -414,7 +414,7 @@ void LLViewerMediaFocus::update()
 		normal = mHoverObjectNormal;
 	}
 	
-	if(media_impl && viewer_object)
+	if(media_impl && viewer_object && !media_impl->isForcedUnloaded())
 	{
 		// We have an object and impl to point at.