991d43709c
merge LL 3.3.3 beta
2012-06-16 07:22:27 -07:00
1777fa5187
Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148
2012-05-25 15:07:22 -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
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
58f9982fbc
SH-2738 Add comment documenting need to not make main thread wait on curl_multi_perform
2011-12-19 15:35:38 -06:00
efec138037
fix for SH-2738 and SH-2777, might also help SH-2723: heap corruption
...
SH-2738: Texture fetching freezes due to LLcurl
SH-2777: viewer crashed on logout in LLCurl::Easy::releaseEasyHandle
2011-12-15 21:39:48 -07:00
4ec112bfce
fix for SH-2738 and SH-2777, might also help SH-2723: heap corruption
...
SH-2738: Texture fetching freezes due to LLcurl
SH-2777: viewer crashed on logout in LLCurl::Easy::releaseEasyHandle
2011-12-15 21:39:48 -07:00
642ea00a08
merge
2011-12-12 10:45:13 -05:00
50a57ba9fe
Backed out changeset fafd857891b1
2011-12-09 12:23:04 -06:00
e181563a27
Merge with 26130/5cf2a0a7266e (FS tip).
2012-01-23 20:50:04 +01:00
161c1b019f
Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
...
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
c86c336b48
trivial: fix a mac build error.
2012-01-12 20:32:32 -07:00
5803b4ca2d
Added Ansariels debug output again
2012-01-13 19:32:33 +01:00
beff8c323e
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
1ebe49b708
Tweak to get a clean import for https://bitbucket.org/VirLinden/vir-project-3/changeset/1878a57aebd7/raw/
2012-01-13 19:30:27 +01:00
213e3c3fd4
Added some debug messages to llcurl.cpp because of FIRE-4617
2012-01-03 23:29:55 +01:00
751a5a9097
add mutex to protect curl_multi-init()
2011-12-20 15:02:21 -07:00
1516e4c497
merge
2011-12-05 17:56:38 -06:00
78233d1bf9
SH-2652 WIP -- Add timers to relevant areas, pause render pipeline while occlusion queries from previous frame are still pending and perform texture decode work.
2011-12-05 17:55:40 -06:00
09feaac844
fix for sh-2738: Texture fetching freezes due to LLcurl
2011-12-05 13:23:05 -07:00
3fc4c14464
fix a mac build error: a friend declaration issue.
2011-11-29 16:18:50 -07:00
b4766d2fde
fix for sh-2601: [crashhunters] crash in LLBufferArray::countAfter()
...
sh-2602: [crashhunters] crash on exit in ~LLPumpIO()
2011-11-21 14:42:21 -07:00
4924f0c99b
b782a75c99e6 backout cleanup
2011-10-14 12:38:48 -05:00
c0ca8e5e2e
Merge backout of b782a75c99e6
2011-10-14 11:58:35 -05:00
4331c112ab
Backed out changeset b782a75c99e6
2011-10-14 11:52:40 -05:00
Tank_Master