f33fff7e15
slightly hairy merge from viewer-trunk
2010-04-20 12:41:00 +01:00
5952fbca31
merge from viewer-hotfix
2010-04-20 12:29:20 +01:00
2f19ad5957
merge from viewer-trunk
2010-04-16 11:24:55 +01:00
05116bac35
merge from viewer-hotfix
2010-04-16 10:58:29 +01:00
04cfcd1edc
Fix for EXT-6813 libcurl on windows had gzip/deflate transfer-encoding disabled.
...
New build of libcurl fixed it.
2010-04-15 18:50:02 -07:00
4d1b17842f
Comment in my last commit was incorrect, it should be: Fix for EXT-3652 (Mac media plugin crashes after loading acrobat.com).
2010-04-15 16:45:29 -07:00
bb20c096b5
Fix for EXT-6638 (cannot sign into linkedin.com)
...
Updated mac llqtwebkit build from the following sources:
revision aacdf69cbf5aa12d77c179296e31ef643ed1ef4a in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch)
revision f35a5eab8c2f in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the 'cookie-api' branch)
2010-04-15 15:41:37 -07:00
3b7b578733
merge from viewer-trunk
2010-04-07 16:53:06 +01:00
4f01a5f452
Merge hotfixbeta into hotfix
2010-04-20 04:32:44 -04:00
3ecec85feb
Update Linux build of LLQtWebKit library.
...
This was built from:
revision c02879cea1c0070eb264e261d316a77d420741c7 in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch)
revision f35a5eab8c2f in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the 'cookie-api' branch)
2010-04-07 15:55:21 +01:00
9572c5ed1b
EXT-6808 Update Vivox SDK to 3.1.0001.8385
2010-04-12 16:55:32 +01:00
54c39177e5
un-hairy merge from viewer-trunk
2010-04-06 15:55:07 +01:00
3d0f02054e
Updated Mac build of LLQtWebKit library.
...
This was built from:
revision c02879cea1c0070eb264e261d316a77d420741c7 in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch)
revision f35a5eab8c2f in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the 'cookie-api' branch)
2010-04-02 15:09:38 -07:00
9e1b600d9b
DEV-47911: Backport webkit security fixes 2010-03-23 (via new version of LLQtWebKit/Windows)
2010-04-02 14:27:13 -07:00
61774546f0
HUGE merge from viewer-trunk. Many conflicts resolved.
2010-03-30 13:15:36 +01:00
61657d2e79
The linux counterpart to changeset 818541c93c7c
2010-03-29 14:14:07 +01:00
4e7838fb00
Implemented central storage mechanism for media plugin cookies.
...
Added LLPluginCookieStore, which manages the central list of cookies.
New Mac and Windows versions of llqtwebkit, built from the tip of the cookie-api branch on http://bitbucket.org/lindenlab/llqtwebkit/ (currently revision f35a5eab8c2f).
Added "set_cookies" and "cookie_set" messages to the media_browser message class in the plugin API, and made the webkit plugin use them appropriately.
Added methods to LLViewerMedia to read/write the cookie file and add/remove individual cookies.
Added hooks to read/write the cookie file (plugin_cookies.txt) in the same places as the location history (idle_startup() in llstartup.cpp and LLAppViewer::cleanup(), respectively).
Reviewed by Richard at http://codereview.lindenlab.com/1006003
2010-03-26 15:39:21 -07:00
cc9d069722
Update Linux build of qt/llqtwebkit. For DEV-47911.
...
revision c02879cea1c0070eb264e261d316a77d420741c7 in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch)
revision 8eff99f78fb0 in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the 'default' branch)
2010-04-07 15:34:24 +01:00
da6bba2ed3
DEV-47911: Backport webkit security fixes 2010-03-23 (via new version of LLQtWebKit/Windows)
2010-04-02 14:10:54 -07:00
e7b7dc36f7
Updated Mac build of LLQtWebKit library.
...
This was built from:
revision c02879cea1c0070eb264e261d316a77d420741c7 in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch)
revision 8eff99f78fb0 in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the 'default' branch)
2010-04-02 13:49:35 -07:00
9c4abda14f
viewer2 merge.
2010-03-22 16:48:34 +00:00
9eaf17dfad
Fix linux llqtwebkit package's runtime borkage.
2010-03-22 11:26:02 +00:00
8424ceb20f
merge
2010-03-20 16:59:41 -05:00
241988c408
Unbreak the linux build, a new linux llqtwebkit package that actually includes the fix required for EXT-6401 & EXT-6402.
2010-03-19 14:41:25 -07:00
53cf87ba50
Updated url for linux llqtwebkit package since s3 hosed the original (EXT-6401 & EXT-6402)
2010-03-19 12:34:31 -07:00
c363865ccf
Merge with tip
2010-03-19 12:21:55 -07:00
3eb5a89f14
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2010-03-19 15:17:27 -04:00
c5fc6d3b2a
New linux package of llqtwebkit library for EXT-6401 and EXT-6402 (add options to enable and disable javascript and flash plugins)
2010-03-19 15:16:50 -04:00
2a75b7b590
Merge with tip (another one)
2010-03-19 11:52:32 -07:00
107e076c83
EXT-6486 Update Vivox SDK to 3.1.0001.8181
...
New Vivox SDK release to fix three main crash issues discovered through automatic crash reporting to Vivox enabled in Beta 4, along with extra diagnostics to help track down the cause of SLVoice failing to exit.
2010-03-19 17:40:39 +00:00
70df3c1fa7
EXT-6401 - Add feature to disable Javascript via prefs (updates Mac LLQtWebKit - via patch from Monroe)
2010-03-18 16:59:29 -07:00
cb7fbc8a20
EXT-6466 "Move "Enable Cookies" checkbox...", EXT-6402 "Add feature to disable Web plugins via prefs" and EXT-6401 "Add feature to disable Javascript via prefs"
...
Apologies for the multiple commit of Jiras - these changes are closely related and impossible to commit deparately
Reviewed by Monroe
2010-03-18 16:53:27 -07:00
663147647d
merge with viewer-2-0
2010-03-13 22:52:53 -06:00
d5e685306c
(for B5) Fix for EXT-5823 "Include language in user-agent string" (implemented via JavaScript - not in ua string)
...
(for B5) Fix for EXT-5314 "Inworld Browser blanks out at credit card entry"
Note: also includes an update to install.xml that points to a new version of LLQtWebKit that is required for these fixes
2010-03-12 14:34:25 -08:00
6079a50186
New linux build of llqtwebkit.
...
Also, disabled LL_QTWEBKIT_USES_PIXMAPS define in media_plugin_webkit.cpp as the QPixmap changes have been backed out of the llqtwebkit build for now.
2010-03-12 13:49:40 -08:00
bf767cc648
New mac build of llqtwebkit.
...
Built from revision da5938d041a1 of hg.lindenlab.com/monroe/llqtwebkit-4.6/
and commit 976cb208e4c1ae9df62bce979a5148d7b89172c5 of http://gitorious.org/+lindenqt/qt/lindenqt
2010-03-12 13:46:35 -08:00
b27ce5bc88
merge from viewer-2-0
2010-03-05 11:16:34 +00:00
7498504c92
EXT-5969 build and merge a shippable pixmap-based llqtwebkit for viewer2.0/linux
...
Maybe also: EXT-4495 flash content crashes Webkit on Linux
2010-03-04 17:22:22 +00:00
99b0d17833
Merge with viewer-2-0
2010-03-01 15:25:35 -06:00
e88f73d074
Merge from https://hg.lindenlab.com/q/viewer-hotfix/
2010-02-25 20:07:39 +00:00
96da7000e3
Update Vivox SDK to 3.1.0001.8016 for DEV-46706
2010-02-25 19:57:48 +00:00
dcbbf64c41
merge
2010-02-22 14:20:50 -08:00
722c5fb92e
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2010-02-22 16:43:59 -05:00
342fa3cb44
Fix for my broken mac/linux boost packages in changeset bb66cb8a076a.
...
Removed shared libraries and added some convenience symbolic links.
implemented as a daggy fix.
2010-02-22 16:33:20 -05:00
f43a9a181e
Do the necessary stuff to package pulseaudio's headers and make it (in theory, not yet in practice) optional.
2010-02-22 16:50:26 +00:00
afb69f1989
Merge
2010-02-19 21:30:17 -06:00
8a02b64a5c
New boost packages for all 3 platforms to fix boost.date_time link errors and SNOW-431.
2010-02-19 21:30:01 -05:00
debf4374df
viewer2 merge.
2010-02-19 16:14:15 +00:00
65f8b95ae8
EXT-5552 Linux viewer running out of address space, crashing frequently and untracably
...
re-fixed.
2010-02-19 16:13:58 +00:00
ab43ec4cbf
viewer2 merge
2010-02-19 16:12:22 +00:00
Tofu Linden