summaryrefslogtreecommitdiff
path: root/indra/media_plugins
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2012-01-17 13:33:19 -0500
committerDebi King (Dessie) <dessie@lindenlab.com>2012-01-17 13:33:19 -0500
commitcd64ae7fb8ee781a5bf9ac47dd2428e659b939c9 (patch)
tree9638dfe3ce3a7d5399d6f52552c9e1e3f308fd46 /indra/media_plugins
parente4f1f611a4736e4b0b78c0d61c3c5f576fec93d0 (diff)
parent2abb1a81c56a27eab02157851cb9e67730231bb6 (diff)
reconciled .hgtags
Diffstat (limited to 'indra/media_plugins')
-rw-r--r--indra/media_plugins/webkit/media_plugin_webkit.cpp4
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