4676c81120
Merge LGPL
2014-02-21 16:45:23 -08:00
a72e34a345
[MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown
...
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-14 13:56:36 -08:00
8ba6b4803b
Merge HTTP
2014-02-12 18:58:40 -08:00
b2d769534c
Code review updates. All comments so far.
2013-11-18 13:33:19 -05:00
6f5790da38
Merge. Pull in viewer-release after 3.6.7 release.
2013-10-04 15:36:52 -04:00
6d9452f8d8
Fix crash and saving of bad data that can result due to bad/corrupted/empty LLSD and status of 200 OK.
...
This mode can be expected on bad networks, like noisy DSL lines or other poor service.
LL code does not pass the parser error down to the caller.
Note that this is the saftest way to fix this as this virtual class is used in many different areas of LL code. Just fixing
it by calling errorWithContent directly may cause new bugs with LL code that does not expect errorWithContent to be called at
all.
2014-01-03 01:34:32 -05:00
200bea5b41
SH-3690 SH-4505 Cleanup pass through code.
...
Start using DNS cache in legacy LLCurl code. Go to 15 seconds
particularly as we're using threaded resolver at this point.
Documentation cleanup. Add libcurl status checking and logging
for curl_easy_setopt() operations that fail. Shouldn't happen
and we'll just continue anyway but there's info in the logs to
track these down now. Cleaned up logic around FASTTIMER enable
defines used to evaluate pipeline stalls in main thread.
Removed long-standing thread race around caps strings and
URL construction. Not a significant risk but refactoring the
code to get rid of them removed one huge eyesore. It can be
made even slicker if desired (see notes).
2013-09-24 14:49:26 -04:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
8895e79576
Merge downstream code / viewer-beta
2013-05-09 13:21:22 -07:00
6e483af1f6
Revert ares and libcurl version update that was causing problems, revise curl
...
handle duplication code. Reviewed by Kelly
2013-04-25 14:14:35 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
b42b789723
Merge in downstream code (chui fixes, materials)
2013-04-11 16:18:34 -07:00
c7bab8ab8b
Merge
2013-04-11 16:04:21 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07: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
2dcbbf04c9
Improve curl/ares init behavior by duping handles instead of calling easy_init
2013-02-28 09:45:43 -08:00
96dc947784
MAINT-2347 Change connect timeout to 30 seconds and request timeout to 4 minutes
2013-02-11 17:32:53 -06:00
52d9b07503
Merge viewer-bear
2013-09-12 21:15:34 -07:00
831e4f443b
Merge LL 3.6.3 pass 1
2013-08-26 17:09:27 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
5e818eecab
Use proper types per declaration when calling curl functions.
2013-06-29 21:59:23 +02:00
465a154f77
Expose timeout parameter for LLCurlRequest::getByteRange
2013-05-15 10:47:16 +02: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
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
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
1d43cb8943
Merge SSB push 4
2013-03-08 17:54:49 -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
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
Tank_Master