diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-11-11 09:32:22 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-11-11 09:32:22 -0800 |
| commit | 1b56b7d2e5ad2b5c4ca2c733b25d1fd7dc78f634 (patch) | |
| tree | 3bb99a6b45b890a5d267d1a8af60711247f9e359 | |
| parent | 4afb450225d83fef55bfee2f63290dcfbc3cfbec (diff) | |
| parent | 2a19aa93e9ec9a6c59a11231694b1f910cf817ea (diff) | |
Pull from viewer-experience
| -rw-r--r-- | autobuild.xml | 8 | ||||
| -rw-r--r-- | indra/media_plugins/webkit/media_plugin_webkit.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/autobuild.xml b/autobuild.xml index 49031b9f17..1b8a61acad 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1206,9 +1206,9 @@ <key>archive</key> <map> <key>hash</key> - <string>7108c2443dbcf4c032305814ce65ebb7</string> + <string>c006dd7f1f7a9d4cb9e2bbf311dd1973</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/244065/arch/Darwin/installer/llqtwebkit-4.7.1-darwin-20111028.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/244983/arch/Darwin/installer/llqtwebkit-4.7.1-darwin-20111110.tar.bz2</string> </map> <key>name</key> <string>darwin</string> @@ -1230,9 +1230,9 @@ <key>archive</key> <map> <key>hash</key> - <string>24048a31d7b852774dc3117acbd4a86a</string> + <string>8e7bbe2ee0a281fdd9c8af0c8f75d206</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/244065/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20111028.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/244983/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20111110.tar.bz2</string> </map> <key>name</key> <string>windows</string> 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 |