diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-13 19:44:01 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-13 19:44:01 +0000 |
| commit | 224cfffa1c46e144f290402f33b96d23cb27d98c (patch) | |
| tree | 052fd0e5c761542d89d3b2553a02acaf68d4d408 /indra/media_plugins/quicktime | |
| parent | 7722105e4ea4b5268f2eb1862eae2d55b3bfc933 (diff) | |
| parent | 7e2d2406584ffe3a0c2f87734ada194a92b82df6 (diff) | |
merge.
Diffstat (limited to 'indra/media_plugins/quicktime')
| -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 ); |