livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,149 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

97 Commits (d77edcdf137e76b135cf8dbf70d10bcda34b00a0)

Author SHA1 Message Date
Tank_Master 0a1a351b86 Merge Viewer-Share 2013-10-21 23:51:34 -07:00
Nicky 1168b7b564 Better fix for FIRE-11406. Just disable TLSv1.2. 2013-08-21 20:49:36 +02:00
Merov Linden 7da4c65191 Pull merge from lindenlab/viewer-release 2013-06-19 14:06:06 -07:00
Graham Madarasz c38204f5e0 Unwind cruft from hunting for 2707 they won't end up in vwr-dev-mat 2013-06-05 14:26:27 -07:00
Graham Madarasz ea24612561 BUG-2707 make use of OsOutputDebugString _DEBUG only on Windows to avoid throwing unhandlable exceptions in coroutines in RelWithDebInfo builds 2013-06-04 07:51:27 -07:00
Graham Madarasz d7e76ed642 BUG-2707 more logging crash hunting 2013-06-03 14:23:51 -07:00
Merov Linden 1c740dfb51 Pull merge from viewer-release 2013-05-22 14:21:49 -07:00
Don Kjer 3a351c4ee5 Adding follow_redirects parameter to LLHTTPClient get/head variants. Not following redirects for facebook connect requests. 2013-05-08 05:51:28 +00:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
prep 8e3b190e91 merge 2013-03-11 15:17:13 -04:00
Nyx Linden 11fe124ae9 merging in viewer-beta. 
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
 2013-01-24 16:22:49 -05:00
Tank_Master 718f6fa0ff merge LL 3.6.1 2013-07-10 00:23:23 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Tank_Master 14001c54df Gastly CHUI merge pass 1, don't count on anything to work. 2013-06-26 12:14:54 -07:00
Kitty Barnett e1526c4048 Merged with Appearance-Misc tip 
--HG--
branch : .RLVa
 2013-02-20 14:26:21 +01:00
Kitty Barnett b368a21202 Merged with Appearance-Misc tip 
--HG--
branch : .RLVa
 2013-02-04 21:06:34 +01:00
Brad Payne (Vir Linden) d4dc41dbd5 misc error detection, debug coloration for avatar meshes 2012-11-01 14:19:00 -04:00
simon@Simon-PC.lindenlab.com 58a73b4fc1 MAINT-1791 : Parcel media clear list crash. Reviewed by Kelly 2012-10-29 13:10:37 -07:00
William Todd Stinson a766e26db4 Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository. 2012-09-10 10:37:02 -07:00
Tank_Master 6207030884 Merge FS LGPL tip 2013-02-23 17:09:53 -08:00
Tank_Master ea86bb88c3 first pass merge 2013-02-04 10:52:32 -08:00
Tank_Master 169263d8b0 Merge LL 3.4.5 beta 3 2013-01-28 01:56:00 -08:00
Tank_Master 93d4b47252 Merge LL 3.4.1 beta 10 2012-10-26 09:59:19 -07:00
Dave Parks 5ec24ecd69 reapply a577ec5b3e5f: Fix for linux build (skip llhttpclient unit tests that post to google.com) 2012-09-20 10:13:45 -04:00
simon@Simon-PC.lindenlab.com b7555a3309 Merge back viewer-lion, which has viewer-development and down-stream fixes 2012-08-01 14:07:24 -07:00
Dave Parks 4a5ad35793 MAINT-570 Remove unused memory tracking system LLMemType 2012-07-20 11:42:15 -05:00
Dave Parks 1d8f117069 Fix for linux build (skip llhttpclient unit tests that post to google.com) 2012-06-27 14:45:50 -05:00
Tank_Master 999bd2130e Merge LL 3.4.0 release 2012-09-13 15:19:30 -07:00
Tank_Master d9c7b9253d merge LL 3.4.0 viewer-beta 2012-08-31 00:18:30 -07:00
Xiaohong Bao 25c21c3761 add more exception handlings for llcurl fix. 2012-01-17 22:56:28 -07:00
Xiaohong Bao 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
Xiaohong Bao 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
Ansariel b8de6ee1a5 Removing additional validation check in llurlrequest.cpp - it's checked in isValid() already 2012-01-22 14:35:55 +01:00
Ansariel 309f9dcfd1 add more exception handlings for llcurl fix. By Bao Linden 2012-01-22 14:30:04 +01:00
ziree f391ec3678 Fix crashes when curl runs out of handles. Proposed fix for FIRE-4772 FIRE-4773 2012-01-20 22:00:56 +01:00
Xiaohong Bao 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
Xiaohong Bao 0fff00ad6c 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
Liny 3bd5a8ddfc Quieting a sometimes noizy debug line. (Changed them into their "_ONCE" version to prevent spamming of the debug log) 2012-01-03 12:18:24 -08:00
Xiaohong Bao 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
Dave Parks c0ca8e5e2e Merge backout of b782a75c99e6 2011-10-14 11:58:35 -05:00
Dave Parks 4331c112ab Backed out changeset b782a75c99e6 2011-10-14 11:52:40 -05:00
Xiaohong Bao 749d9ebadc Merge 2011-08-31 10:48:56 -06:00
Logan Dethrow 797b4df42a Backed out changeset 694594710de2 2011-08-16 17:35:16 -04:00
Logan Dethrow 61a7a874aa Backed out rev 42d5f5df0a6a. Code was apparently needed afterall. 2011-08-15 20:05:28 -04:00
Logan Dethrow 3743ec176c LLProxy: Removed unneeded call to LLProxy::applyProxySettings, since it was already being called. 2011-08-15 13:21:33 -04:00
Logan Dethrow 814a2d24dc Merge 2011-07-28 10:41:59 -04:00
Dave Parks 764a13a196 SH-2031 Don't do network I/O from the main thread in llcurl. 
Reviewed by Kelly
 2011-07-21 17:35:04 -05:00
Logan Dethrow 859dc52c30 STORM-1112 Protected LLProxy members during cross-thread calls to LLProxy::applyProxySettings() 2011-07-21 15:16:54 -04:00
Logan Dethrow 792667ff8e STORM-1112 Added LLProxy::applyProxySettings() to apply proxy settings to curl handles. 
Added call to that function everywhere curl handles are created in the viewer.
 2011-07-19 14:20:21 -04:00