summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcallum <none@none>2009-10-29 11:46:32 -0700
committercallum <none@none>2009-10-29 11:46:32 -0700
commita99493e8d0157a3ff27bc2d1778464bf127a2993 (patch)
treeb7b99fd9b4b6a66535fab951b3f8565144a3416f
parent95031093c795f3a97cdc673c7b7807c944742ab8 (diff)
Fix for - DEV-41731 (HTTP AUTH issues).
Reintroduces "white-flash" but this is less important than fix for now. Also cleaned up a code typo.
-rw-r--r--indra/media_plugins/webkit/media_plugin_webkit.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index 7c9e27a760..3ce8ff3deb 100644
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -207,14 +207,13 @@ private:
// don't flip bitmap
LLQtWebKit::getInstance()->flipWindow( mBrowserWindowId, true );
- // Set the background color to black
- LLQtWebKit::getInstance()->
// set background color to be black - mostly for initial login page
LLQtWebKit::getInstance()->setBackgroundColor( mBrowserWindowId, 0x00, 0x00, 0x00 );
- // go to the "home page"
// Don't do this here -- it causes the dreaded "white flash" when loading a browser instance.
-// LLQtWebKit::getInstance()->navigateTo( mBrowserWindowId, "about:blank" );
+ // FIXME: Re-added this because navigating to a "page" initializes things correctly - especially
+ // for the HTTP AUTH dialog issues (DEV-41731). Will fix at a later date.
+ LLQtWebKit::getInstance()->navigateTo( mBrowserWindowId, "about:blank" );
// set flag so we don't do this again
mBrowserInitialized = true;