diff options
author | Oz Linden <oz@lindenlab.com> | 2011-12-13 10:23:22 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-12-13 10:23:22 -0500 |
commit | d5f48181b50d9e941abafd76692359869e71a36d (patch) | |
tree | 66f2a744ca09c0ff483038ed639a5dd552cd5272 /indra/media_plugins/webkit/media_plugin_webkit.cpp | |
parent | 34b1982d33c83bb58c95bcedf36c9b5cd097584f (diff) | |
parent | dbc91a7fac9513bdd879c5c2dc82208e08eaad2d (diff) |
merge up to latest viewer-development
Diffstat (limited to 'indra/media_plugins/webkit/media_plugin_webkit.cpp')
-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 |