diff options
| author | Richard Linden <none@none> | 2011-12-08 11:02:00 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-12-08 11:02:00 -0800 |
| commit | dd9263d01780fe23b8c329e0fd8d8c140b04c174 (patch) | |
| tree | 53f8c1fc6d299576d82b7932079ea0c4d6910990 /indra/media_plugins/webkit | |
| parent | 9fbee8bd46e1fae770deedb960701899a8e18b84 (diff) | |
| parent | 1231c86d2fc1f4a93c97e9c42e58c917f71b6718 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/media_plugins/webkit')
| -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 |