ec8aac269f
Fix merge error in llurlrequest.cpp.
2014-06-10 10:50:47 +02:00
8863d9beaf
Compile fixes
2014-06-09 23:27:05 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
fe518bde8e
merge with release
2013-11-06 17:22:04 -08:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
7da4c65191
Pull merge from lindenlab/viewer-release
2013-06-19 14:06:06 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
c38204f5e0
Unwind cruft from hunting for 2707 they won't end up in vwr-dev-mat
2013-06-05 14:26:27 -07:00
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
d7e76ed642
BUG-2707 more logging crash hunting
2013-06-03 14:23:51 -07:00
1c740dfb51
Pull merge from viewer-release
2013-05-22 14:21:49 -07:00
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
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
68f9f656cd
merge with viewer-release
2013-03-22 00:44:59 -07:00
8e3b190e91
merge
2013-03-11 15:17:13 -04:00
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
0a1a351b86
Merge Viewer-Share
2013-10-21 23:51:34 -07:00
1168b7b564
Better fix for FIRE-11406. Just disable TLSv1.2.
2013-08-21 20:49:36 +02:00
718f6fa0ff
merge LL 3.6.1
2013-07-10 00:23:23 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
e1526c4048
Merged with Appearance-Misc tip
...
--HG--
branch : .RLVa
2013-02-20 14:26:21 +01:00
b368a21202
Merged with Appearance-Misc tip
...
--HG--
branch : .RLVa
2013-02-04 21:06:34 +01:00
6db6cb39f4
SH-3406 WIP convert fast timers to lltrace system
...
got new fast timer code to compile and run
2012-11-16 23:02:53 -08:00
9d77e030d9
SH-3406 WIP convert fast timers to lltrace system
...
cleaning up build
moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc
streamlined Time class and consolidated functionality in BlockTimer class
llfasttimer is no longer included via llstring.h, so had to add it manually in several places
2012-11-14 23:52:27 -08:00
d4dc41dbd5
misc error detection, debug coloration for avatar meshes
2012-11-01 14:19:00 -04:00
58a73b4fc1
MAINT-1791 : Parcel media clear list crash. Reviewed by Kelly
2012-10-29 13:10:37 -07:00
a766e26db4
Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository.
2012-09-10 10:37:02 -07:00
6207030884
Merge FS LGPL tip
2013-02-23 17:09:53 -08:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
169263d8b0
Merge LL 3.4.5 beta 3
2013-01-28 01:56:00 -08:00
93d4b47252
Merge LL 3.4.1 beta 10
2012-10-26 09:59:19 -07:00
5ec24ecd69
reapply a577ec5b3e5f: Fix for linux build (skip llhttpclient unit tests that post to google.com)
2012-09-20 10:13:45 -04:00
b7555a3309
Merge back viewer-lion, which has viewer-development and down-stream fixes
2012-08-01 14:07:24 -07:00
4a5ad35793
MAINT-570 Remove unused memory tracking system LLMemType
2012-07-20 11:42:15 -05:00
1d8f117069
Fix for linux build (skip llhttpclient unit tests that post to google.com)
2012-06-27 14:45:50 -05:00
999bd2130e
Merge LL 3.4.0 release
2012-09-13 15:19:30 -07:00
d9c7b9253d
merge LL 3.4.0 viewer-beta
2012-08-31 00:18:30 -07:00
25c21c3761
add more exception handlings for llcurl fix.
2012-01-17 22:56:28 -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
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
b8de6ee1a5
Removing additional validation check in llurlrequest.cpp - it's checked in isValid() already
2012-01-22 14:35:55 +01:00
309f9dcfd1
add more exception handlings for llcurl fix. By Bao Linden
2012-01-22 14:30:04 +01:00
f391ec3678
Fix crashes when curl runs out of handles. Proposed fix for FIRE-4772 FIRE-4773
2012-01-20 22:00:56 +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
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
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
Nicky