diff options
| author | callum <none@none> | 2009-11-13 11:03:39 -0800 | 
|---|---|---|
| committer | callum <none@none> | 2009-11-13 11:03:39 -0800 | 
| commit | be72748d2a69ddda51c4b41c0c8f2beba077b265 (patch) | |
| tree | 4c47a32fcef6c68c71d2c620a527e05f869e5e87 /indra/media_plugins | |
| parent | 230f28080cfcb6785c248340aaa42cfb29703b23 (diff) | |
Fix for DEV-42152 (Streaming media broken on QuickTime)
Diffstat (limited to 'indra/media_plugins')
| -rw-r--r-- | indra/media_plugins/quicktime/media_plugin_quicktime.cpp | 16 | 
1 files changed, 11 insertions, 5 deletions
| diff --git a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp index de927de1cd..dac0509531 100644 --- a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp +++ b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp @@ -528,11 +528,17 @@ private:  		if ( ! mMovieController )  			return; -		// service QuickTime -		// Calling it this way doesn't have good behavior on Windows... -//		MoviesTask( mMovieHandle, milliseconds ); -		// This was the original, but I think using both MoviesTask and MCIdle is redundant.  Trying with only MCIdle. -//		MoviesTask( mMovieHandle, 0 ); +		// this wasn't required in 1.xx viewer but we have to manually  +		// work the Windows message pump now +		#if defined( LL_WINDOWS ) +		MSG msg;
 +		while ( PeekMessage( &msg, NULL, 0, 0, PM_NOREMOVE ) ) 
 +		{
 +			GetMessage( &msg, NULL, 0, 0 );
 +			TranslateMessage( &msg );
 +			DispatchMessage( &msg );
 +		};
 +		#endif  		MCIdle( mMovieController ); | 
