From d8ff809092c632af75d4d3686b3483735469bc35 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Wed, 5 Sep 2012 04:12:13 +0200 Subject: [PATCH] Make webkit work with Qt 4.8 --- indra/plugins/webkit/media_plugin_webkit.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/plugins/webkit/media_plugin_webkit.cpp b/indra/plugins/webkit/media_plugin_webkit.cpp index e64a89d88..6ff524fb9 100644 --- a/indra/plugins/webkit/media_plugin_webkit.cpp +++ b/indra/plugins/webkit/media_plugin_webkit.cpp @@ -160,8 +160,8 @@ private: mVolumeCatcher.pump(); checkEditState(); - - if(mInitState == INIT_STATE_NAVIGATE_COMPLETE) + + if(mInitState >= INIT_STATE_NAVIGATE_COMPLETE) { if(!mInitialNavigateURL.empty()) { @@ -284,7 +284,7 @@ private: bool result = LLQtWebKit::getInstance()->init( application_dir, component_dir, mProfileDir, native_window_handle ); if ( result ) { - mInitState = INIT_STATE_INITIALIZED; + setInitState(INIT_STATE_INITIALIZED); // debug spam sent to viewer and displayed in the log as usual postDebugMessage( "browser initialized okay" );