diff options
author | Merov Linden <merov@lindenlab.com> | 2011-11-11 09:32:22 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2011-11-11 09:32:22 -0800 |
commit | 1b56b7d2e5ad2b5c4ca2c733b25d1fd7dc78f634 (patch) | |
tree | 3bb99a6b45b890a5d267d1a8af60711247f9e359 /indra/media_plugins | |
parent | 4afb450225d83fef55bfee2f63290dcfbc3cfbec (diff) | |
parent | 2a19aa93e9ec9a6c59a11231694b1f910cf817ea (diff) |
Pull from viewer-experience
Diffstat (limited to 'indra/media_plugins')
-rw-r--r-- | indra/media_plugins/webkit/media_plugin_webkit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index 13d51099a8..47f8dcd545 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -382,9 +382,9 @@ private: //lldebugs << "data url is: " << url.str() << llendl; - // loading overlay debug screen follows media debugging flag from client for now. + // always display loading overlay now #if LLQTWEBKIT_API_VERSION >= 16 - LLQtWebKit::getInstance()->enableLoadingOverlay(mBrowserWindowId, mEnableMediaPluginDebugging); + LLQtWebKit::getInstance()->enableLoadingOverlay(mBrowserWindowId, true); #else llwarns << "Ignoring enableLoadingOverlay() call (llqtwebkit version is too old)." << llendl; #endif |