4405910caa
Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes
2012-01-04 14:15:05 -07:00
94ad019ce3
fix for SH-2823 and SH-2824: crash in curl: LLBufferArray::countAfter() and LLBufferArray::copyIntoBuffers
...
reviewed by vir
2012-01-04 14:14:23 -07: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
f1a4593e47
merge changes for vmrg-204
2011-12-12 09:04:33 -05:00
50a57ba9fe
Backed out changeset fafd857891b1
2011-12-09 12:23:04 -06:00
0e8cd7c9ac
fix for build error (warning for unreachable code)
2011-12-08 15:36:44 -08:00
8a51346d6f
merge
2011-12-07 17:25:06 -05:00
50ed3bde43
merge
2011-12-07 17:06:42 -05: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
8cbc54d519
Automated merge with http://hg.secondlife.com/viewer-development
2011-12-01 16:53:28 -05:00
3fc4c14464
fix a mac build error: a friend declaration issue.
2011-11-29 16:18:50 -07:00
85392acac0
merge
2011-11-29 14:43:09 -06: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
cc1fb7bcac
LLSD-14: Bring over llsd.{h,cpp} enhancements from server-trunk.
...
Because new enum values have been added to the LLSD type field, a few external
switch statements must be adjusted to suppress fatal warnings, even though we
never expect to encounter an LLSD instance containing any of the new values.
2011-11-17 08:06:31 -05:00
cfb666e9d9
merge
2011-11-15 17:04:37 -06:00
55f69de90c
merge
2011-11-02 11:46:18 -05:00
4fd9a53115
Merge STORM-959
2011-10-26 01:42:26 +01:00
f19f43c746
merge
2011-10-19 16:21:18 -05:00
53ce47fc1c
merge changes for STORM-1654
2011-10-18 17:40:04 -04: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
7ffa6ba854
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
2011-10-05 13:01:57 -07:00
f657f5a428
SH-2276 Remove some log spam to alleviate stalls on login.
2011-09-28 15:54:02 -05:00
83732a7083
SH-2445 Potential fix for crash in LLCurl::Multi::~Multi -- lock sMultiMutex around curl_multi_ calls in LLCurl::Multi destructor
2011-09-19 16:39:16 -05:00
758b936dea
Trying to fix Mac build issue
2011-09-14 13:24:31 -04:00
0a0ae2dd3f
STORM-1562 Potential fix for crash in LLCurl::run -- don't run curl_multi_perform from multiple threads simultaneously.
2011-09-13 12:45:28 -05:00
7d381c6596
LLProxy: Moved the enabling of the UDP proxy back into startSOCKSProxy()
2011-09-08 10:43:07 -04:00
b8fddce34d
Merge. Fixed issue with LLProxy code related to changes to the LLSocket interface.
2011-09-07 16:40:40 -04:00
f73b795bb7
Renamed LLCurl::check_curl_code() and LLCurl::check_curl_multi_code() to prevent ambiguous name build error.
2011-09-06 17:33:18 -04:00
a8d49f7cf5
LLProxy code review fixes.
...
* Removed check_curl_code and check_curl_multi_code from the global namespace.
* Added comments documenting which thread the public methods of LLProxy should be called from.
* Corrected grammar in LLSingleton.h
* Fixed a buffer scope problem in llpacketring.cpp.
2011-09-06 16:54:53 -04:00
6ab0bc8789
LLProxy start of code review cleanup.
2011-09-01 16:44:04 -04:00
749d9ebadc
Merge
2011-08-31 10:48:56 -06:00
4fb809eed5
Backed out revision cbc793dcd3db to disable libcurl verbose logging.
2011-08-18 16:10:49 -04:00
797b4df42a
Backed out changeset 694594710de2
2011-08-16 17:35:16 -04:00
61a7a874aa
Backed out rev 42d5f5df0a6a. Code was apparently needed afterall.
2011-08-15 20:05:28 -04:00
ff870e9770
Back out later: Turned on curl verbose logging for debugging purposes.
2011-08-15 13:22:23 -04:00
3743ec176c
LLProxy: Removed unneeded call to LLProxy::applyProxySettings, since it was already being called.
2011-08-15 13:21:33 -04:00
f73ec6a037
merge
2011-08-12 14:24:00 -04:00
Xiaohong Bao