465a154f77
Expose timeout parameter for LLCurlRequest::getByteRange
2013-05-15 10:47:16 +02:00
1d43cb8943
Merge SSB push 4
2013-03-08 17:54:49 -08:00
54cdc322b8
Fixing issues with not detecting when LLSD XML parsing fails. Changing most http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam.
2013-03-05 22:05:22 -08:00
cc44316aed
Merge LL 3.4.3,
...
Note: aligned some of our code with LL's, spcifically feature table, gpu table, texture fetching, and some rendering defaults behavior.
2012-12-18 00:36:35 -08:00
5b5f4c8bf5
Merge LL 3.4.2 release,
...
broken revision, KDU package needs updating, mac packager also likely broken
2012-12-14 07:59:55 -08:00
1709952adb
pull back 3.4.1-beta6 fixes
2012-10-10 21:40:10 -04:00
827d8814cf
MAINT-1688 Potential fix for crash on exit in LLTextureFetch
2012-10-09 13:34:28 -05:00
374f20edf0
Fix non-thread-safe refcounting of LLHTTPClient::Responder and fix out-of-order deletion of LLTextureFetch on shutdown
2012-10-03 14:30:21 -05:00
05dbd7dafe
Instrument debug builds on windows to help track down source of heap corruption
2012-10-02 16:06:14 -05:00
0755cb098d
Merge. Refresh DRTVWR-209 with 3.4.2-beta1 code.
...
Two fairly simple conflicts: dead stats sending code in the
texture fetch code (new llcorehttp library) and the cleanup
code in llappviewer was moved around in 3.4.x.
2012-11-07 13:28:42 -05:00
04e8d074b2
DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.
...
This was yet another refresh from v-d because of significant changes
to lltexturefetch that would not have been resolvable by casual
application of any merge tool. There are still a few questions
outstanding but this is the initial, optimistic merge.
2012-09-07 12:53:07 -04:00
93d4b47252
Merge LL 3.4.1 beta 10
2012-10-26 09:59:19 -07:00
140138efac
Make intrusive_ptr_addref/release threadsafe and move them out of namespace boost
2012-10-22 21:39:48 +02:00
8e5197a71b
Merge 3.3.3 release with Drano HTTP library at 3.3.0
...
Big delta was converting the new texture debugger support code
to the new library. Viewer manifest should probably get an eyeball
before release.
2012-07-02 18:06:22 -04:00
0730b24d7c
fix merge conflicts: v-r to drano
2012-06-26 22:27:24 -06:00
74d4f8af01
v-r to drano merge conflicts wip
2012-06-26 16:43:58 -04:00
841a447e55
Limit libcurl's DNS resolution to IPV4 addresses for now. Callers
...
who want to try IPV6 can still override at will using CURLOPT_IPRESOLVE.
2012-06-08 16:12:52 +00:00
1777fa5187
Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148
2012-05-25 15:07:22 -07:00
cbb14e223c
fix for SH-3137: delay to issue new http fetching requests if http connection failure happens
2012-05-25 14:08:33 -06:00
e37917b668
fix for VWR-28996: Texture stalls and threading models
2012-05-24 14:32:14 -06:00
56af97063a
Pull from vir/drano
2012-05-02 15:59:15 -07:00
efd19dddd9
SH-3126 : Improve curl byte range call, test implementation in lltexturefetch (not final)
2012-05-02 10:37:51 -07:00
678864e4ed
merge viewer-release to drano
2012-05-02 13:00:59 -04:00
78f2663c4a
Automated merge with http://hg.secondlife.com/viewer-release
2012-04-26 14:04:55 -04:00
4ccae31320
SH-3115 FIX Crash on exit, curl handles not empty
...
Reviewed by Ted.
2012-04-23 11:28:52 -07:00
991d43709c
merge LL 3.3.3 beta
2012-06-16 07:22:27 -07:00
482f59ace9
Replaced assert in CURL shutdown with log warning to prevent pointless crashing (FIRE-6237)
2012-05-07 19:13:56 +02:00
e61c20d499
Merge LL 3.3.1 Viewer Release
2012-04-26 17:31:35 -07:00
eb0568c975
FIRE-5368, FIRE-5756, VWR-28039, VWR-28629; make Firestorm work with openssl 1.x.
2012-03-28 23:48:49 +02:00
88edb8da4e
fix for MAINT-701: crash at LLCurl::Multi::markDead()
...
reviewed by davep
2012-03-08 17:58:25 -07:00
2ed1de224a
Automated merge with http://hg.secondlife.com/viewer-development
2012-02-06 15:28:45 -08:00
5e74293b0c
fix for SH-2941: crash at LLCurl::Easy::~Easy()
2012-02-03 22:01:46 -07:00
5a14a67e06
converted a bunch of narrowing implicit conversions to explicit
2012-02-01 13:03:46 -08:00
717a6f3306
Introduce two new parameters "CurlUseMultipleThreads" and "CurlRequestTimeOut" for QA to test Curl.
2012-01-25 18:27:40 -07:00
1316f33130
fix for SH-2904: textures remain stuck in HTP state
2012-01-25 16:01:56 -07:00
9e6a5d7211
fix for SH-2823 and SH-2824: LLCurl crash inside LLBufferArray::countAfter() and LLBufferArray::copyIntoBuffers
2012-01-20 11:55:15 -07:00
25c21c3761
add more exception handlings for llcurl fix.
2012-01-17 22:56:28 -07:00
11bd5cb860
trivial: fix a mac build error.
2012-01-12 20:32:32 -07:00
f082de03ff
fix for SH-2845, SH-2846, SH-2847, SH-2851: curl crashes and out-of-memory crashes.
2012-01-12 16:36:56 -07:00
050be7eddf
Merge up to 26341 / 767757e005e3 (V/dev tip).
2012-01-31 11:38:33 +01:00
4471d2d9e9
Merge up to 26316 / da55d446b925 (FS tip).
2012-01-27 18:52:33 +01:00
ba483e4fc6
fix for SH-2904: textures remain stuck in HTP state
2012-01-25 16:01:56 -07:00
407c3fcd43
fix for SH-2823 and SH-2824: LLCurl crash inside LLBufferArray::countAfter() and LLBufferArray::copyIntoBuffers
2012-01-20 11:55:15 -07:00
309f9dcfd1
add more exception handlings for llcurl fix. By Bao Linden
2012-01-22 14:30:04 +01:00
a3e30250e8
merge
2012-01-04 09:59:57 -05:00
ec06aa129f
add mutex to protect curl_multi-init()
2011-12-20 15:02:21 -07:00
1620ad6d00
more tuning of llcurl code targeting crashes like SH-2777.
2011-12-20 11:04:10 -07:00
cfc6ac76e1
more tuning of llcurl code targeting crashes like SH-2777.
2011-12-20 11:04:10 -07:00
5affaf264d
SH-2738 Don't lock unless we really need to
2011-12-19 16:55:21 -06:00
43e3603cd7
SH-2738 Don't lock unless we really need to
2011-12-19 16:55:21 -06:00
Ansariel