diff options
| author | callum <none@none> | 2011-11-02 15:08:54 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-11-02 15:08:54 -0700 |
| commit | 637c24440f66930fff4228bbed07d2e1cbf5bcb0 (patch) | |
| tree | 617353a73df0ddf04d7e471b88a0309d98d9c068 /indra | |
| parent | 334d8f4076b4045e8fd4ede5fd9d31f0b185ded4 (diff) | |
| parent | 91354304fc8a5dd400aefa8047c2e1fe62d143bd (diff) | |
Merge with head
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/media_plugins/webkit/media_plugin_webkit.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index c7c66e5895..13d51099a8 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -383,8 +383,11 @@ private: //lldebugs << "data url is: " << url.str() << llendl; // loading overlay debug screen follows media debugging flag from client for now. +#if LLQTWEBKIT_API_VERSION >= 16 LLQtWebKit::getInstance()->enableLoadingOverlay(mBrowserWindowId, mEnableMediaPluginDebugging); - +#else + llwarns << "Ignoring enableLoadingOverlay() call (llqtwebkit version is too old)." << llendl; +#endif str.clear(); str << "Loading overlay enabled = " << mEnableMediaPluginDebugging << " for mBrowserWindowId = " << mBrowserWindowId; postDebugMessage( str.str() ); |