diff options
| author | Richard Linden <none@none> | 2011-11-14 15:39:41 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-14 15:39:41 -0800 |
| commit | 3c5cdd2948d4c215d70a86a1cab12ae55d3958b9 (patch) | |
| tree | de94b58ecd23ef5d8e4304602dc8b55a1cc96bd6 /indra/media_plugins/webkit/media_plugin_webkit.cpp | |
| parent | 7766ccb7731a596d6716e9d0def90b3d7da5fcf3 (diff) | |
| parent | 98755a62bb414f23919e003101153c20d3ab3f72 (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 |