diff options
| author | Richard Linden <none@none> | 2011-11-30 17:57:09 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-30 17:57:09 -0800 |
| commit | c191f523a915888b9d388e1736554dec64f7d887 (patch) | |
| tree | 1a41f168db2dc9a70ea2890e120281c0d1f5410d /indra/media_plugins/webkit/media_plugin_webkit.cpp | |
| parent | f5a94e0f8196c5c068995090cd57bb27e97aaac9 (diff) | |
| parent | 0323a37ac6c55e3ed599f60f4950c49e0e084c4a (diff) | |
Automated merge with http://hg.secondlife.com/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 |