From 530c44c798253c978a0b1a8f0aed876f3f8ba159 Mon Sep 17 00:00:00 2001 From: callum Date: Mon, 3 Oct 2011 17:41:07 -0700 Subject: Update LLQtWebKit libraries to version with *ONLY* SSL fix for Mac. --- autobuild.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 347ef419ed..9a68a70470 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1206,9 +1206,9 @@ archive hash - 9cd66e879908f047d9af665b92946ecc + 1b92a69f5eba7cd8b017180659076db5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/239803/arch/Darwin/installer/llqtwebkit-4.7.1-darwin-20110830.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/roxie_3p-llqtwebkit/rev/242182/arch/Darwin/installer/llqtwebkit-4.7.1-darwin-20111003.tar.bz2 name darwin @@ -1230,9 +1230,9 @@ archive hash - ab9393795515cbbe9526bde33b41bf2a + 1e7f24b69b0fc751c7e86efe7c621882 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/239670/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20110829.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/roxie_3p-llqtwebkit/rev/242182/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20111003.tar.bz2 name windows -- cgit v1.3 From 9bb730443456dd26c0812b96d5311ad11af02c51 Mon Sep 17 00:00:00 2001 From: callum Date: Wed, 26 Oct 2011 11:53:44 -0700 Subject: Point to new version of LLQtWebKit that has support for page zooming for Mac/Wndows versions --- autobuild.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 347ef419ed..557a6f5ec0 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1206,9 +1206,9 @@ archive hash - 9cd66e879908f047d9af665b92946ecc + b8fd242bb1e65f0a534cbe0a84b03958 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/239803/arch/Darwin/installer/llqtwebkit-4.7.1-darwin-20110830.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/243922/arch/Darwin/installer/llqtwebkit-4.7.1-darwin-20111026.tar.bz2 name darwin @@ -1230,9 +1230,9 @@ archive hash - ab9393795515cbbe9526bde33b41bf2a + 8d3f9291493ea81442684eff0b3a5e53 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/239670/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20110829.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/243860/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20111026.tar.bz2 name windows -- cgit v1.3 From 716c2ed53cb94053f762666470efcb3d28a24218 Mon Sep 17 00:00:00 2001 From: callum Date: Mon, 31 Oct 2011 11:33:22 -0700 Subject: Point to new version of LLQtWebKit for Mac/Windows (Rolls in some debugging graphics and Roxie's Mac / SSL changes) --- autobuild.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 347ef419ed..49031b9f17 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1206,9 +1206,9 @@ archive hash - 9cd66e879908f047d9af665b92946ecc + 7108c2443dbcf4c032305814ce65ebb7 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/239803/arch/Darwin/installer/llqtwebkit-4.7.1-darwin-20110830.tar.bz2 + 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 name darwin @@ -1230,9 +1230,9 @@ archive hash - ab9393795515cbbe9526bde33b41bf2a + 24048a31d7b852774dc3117acbd4a86a url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/239670/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20110829.tar.bz2 + 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 name windows -- cgit v1.3 From 2a19aa93e9ec9a6c59a11231694b1f910cf817ea Mon Sep 17 00:00:00 2001 From: callum Date: Thu, 10 Nov 2011 19:00:03 -0800 Subject: Point to improved loading overlay and turn it on always --- autobuild.xml | 8 ++++---- indra/media_plugins/webkit/media_plugin_webkit.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 49031b9f17..1b8a61acad 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1206,9 +1206,9 @@ archive hash - 7108c2443dbcf4c032305814ce65ebb7 + c006dd7f1f7a9d4cb9e2bbf311dd1973 url - 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 + 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 name darwin @@ -1230,9 +1230,9 @@ archive hash - 24048a31d7b852774dc3117acbd4a86a + 8e7bbe2ee0a281fdd9c8af0c8f75d206 url - 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 + 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 name windows 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 -- cgit v1.3 From 01e75a3d85f78697736629f703bd133cae95acf9 Mon Sep 17 00:00:00 2001 From: callum Date: Fri, 18 Nov 2011 15:24:29 -0800 Subject: Update LLQtWebKit to fix EXP-1191 Update loading overlay graphic to resemble a typical Web loading... spinner --- autobuild.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 1b8a61acad..bb6de76d7a 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1206,9 +1206,9 @@ archive hash - c006dd7f1f7a9d4cb9e2bbf311dd1973 + 4b144790799df284f2ebe739a21aa4ec url - 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 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/245528/arch/Darwin/installer/llqtwebkit-4.7.1-darwin-20111118.tar.bz2 name darwin @@ -1230,9 +1230,9 @@ archive hash - 8e7bbe2ee0a281fdd9c8af0c8f75d206 + 60a36c75456eaffc4858bc11df1c49a9 url - 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 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/245528/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20111118.tar.bz2 name windows -- cgit v1.3 From 587a1a425a8e57139a863d5c4a37de108afa6d40 Mon Sep 17 00:00:00 2001 From: callum Date: Thu, 1 Dec 2011 14:19:52 -0800 Subject: EXP-1649 FIX (client) Turn off web loading spinner until a more visually pleasing one can be defined --- autobuild.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index bb6de76d7a..11c57f43fb 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1206,9 +1206,9 @@ archive hash - 4b144790799df284f2ebe739a21aa4ec + 26aa7c367ffadd573f61a6a96f820f80 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/245528/arch/Darwin/installer/llqtwebkit-4.7.1-darwin-20111118.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/245988/arch/Darwin/installer/llqtwebkit-4.7.1-darwin-20111201.tar.bz2 name darwin @@ -1230,9 +1230,9 @@ archive hash - 60a36c75456eaffc4858bc11df1c49a9 + d7743d42de9a5e48809dedf4b64e53e4 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/245528/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20111118.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/245988/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20111201.tar.bz2 name windows -- cgit v1.3 From 31029babe2f9f6eb3fc3205da93c1eccd7a74ed4 Mon Sep 17 00:00:00 2001 From: callum Date: Fri, 2 Dec 2011 11:50:04 -0800 Subject: EXP-1649 FIX +1 (client) Turn off web loading spinner until a more visually pleasing one can be defined --- autobuild.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 11c57f43fb..9914be6867 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1230,7 +1230,7 @@ archive hash - d7743d42de9a5e48809dedf4b64e53e4 + 270db8568a0c4bab266d98e1a820aec4 url http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/245988/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20111201.tar.bz2 -- cgit v1.3 From 2d360cb08d2bee098168e3c3f5041ec37206f383 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 9 Feb 2012 07:44:23 -0500 Subject: Use new 3p-apr package builds for Windows, Mac. On Linux, new (Feb 2012) APR package produces link errors. Until those are resolved, leave Linux viewer build with older (Feb 2011) APR package. --- autobuild.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 9914be6867..9cecdd7f09 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -90,9 +90,9 @@ archive hash - 9868bfa0b6954e4884c49c6f30068c80 + 6e5172597f00380b5004b8a7911098b7 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.4.2-darwin-20110217.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-apr/rev/249125/arch/Darwin/installer/apr_suite-1.4.5-darwin-20120208.tar.bz2 name darwin @@ -114,9 +114,9 @@ archive hash - 73785c200a5b4ef74a1230b028bb680d + a596a9974ae6bfe48dc61a2cd13bc321 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.4.2-windows-20110217.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-apr/rev/249125/arch/CYGWIN/installer/apr_suite-1.4.5-windows-20120208.tar.bz2 name windows -- cgit v1.3 From 58348bd862163261fb650d8afd50fd1dc5e2695a Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 9 Feb 2012 15:07:02 -0500 Subject: Use newer (Linden extension) TC APR builds for Windows, Mac. --- autobuild.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 9cecdd7f09..80b1a8a709 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -90,9 +90,9 @@ archive hash - 6e5172597f00380b5004b8a7911098b7 + 71d4d242c41ec9ac4807989371279708 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-apr/rev/249125/arch/Darwin/installer/apr_suite-1.4.5-darwin-20120208.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-apr/rev/249241/arch/Darwin/installer/apr_suite-1.4.5-darwin-20120209.tar.bz2 name darwin @@ -114,9 +114,9 @@ archive hash - a596a9974ae6bfe48dc61a2cd13bc321 + 983378883a6eec65665875a3d1ba495f url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-apr/rev/249125/arch/CYGWIN/installer/apr_suite-1.4.5-windows-20120208.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-apr/rev/249241/arch/CYGWIN/installer/apr_suite-1.4.5-windows-20120209.tar.bz2 name windows -- cgit v1.3