Merge branch 'curlthreading2' into curlthreading3

2012-09-06 15:12:22 +02:00
parent 83b13f6a3f e3752aefed
commit e7cd445491
4070 changed files with 25269 additions and 20661 deletions
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -338,7 +338,14 @@ void LLViewerMedia::setVolume(F32 volume)
 	{
 		LLViewerMediaImpl* pimpl = *iter;
 		LLPluginClassMedia* plugin = pimpl->getMediaPlugin();
-		plugin->setVolume(volume);
+		if(plugin)
+		{
+			plugin->setVolume(volume);
+		}
+		else
+		{
+			llwarns << "Plug-in already destroyed" << llendl;
+		}
 	}
 }