dc353c205a
Merge
2014-06-10 20:27:31 -07:00
6095a2072d
more deprecated call fixes (llmsg -> LL_MSG() / llendl -> LL_ENDL)
2014-06-10 08:01:16 -07:00
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
99ab6bd049
Add ETW support to get custom trace points eg in xperf traces.
2014-06-04 18:37:19 +02:00
250db74bf9
Pull and merge viewer-release as version 3.7.8
2014-05-07 10:56:41 -07:00
41ebb56b9e
Build proper full name in legacy LLCacheName::getIfThere()
2014-03-20 11:18:11 +01:00
3d1ac7c0ec
Merge LL 3.7.3 (Viewer-Bear fixes)
2014-03-17 14:14:15 -07:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
6f1df3172e
Merge viewer-release
2014-02-25 16:45:19 -08:00
80b4a4a1f5
merge with release
2014-02-24 18:45:59 -08:00
dd8b32473e
Merge downstream code
2014-02-25 16:47:31 -08:00
4676c81120
Merge LGPL
2014-02-21 16:45:23 -08:00
2ccebebece
More memory cleanup of containers after DeletePairedPointer() usage.
2014-02-14 14:57:08 -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
1033c9d67f
MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:
...
- memory leaks fixing;
2014-02-05 20:45:09 +02:00
52ce788d0c
Pull in viewer-lion to lock down next release
2014-02-18 16:41:21 -08:00
38915f119c
More memory cleanup of containers after DeletePairedPointer() usage.
2014-02-14 14:57:08 -08:00
d7b902d575
[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
e6c85c46c4
MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:
...
- memory leaks fixing;
2014-02-05 20:45:09 +02:00
2a1098552e
MAINT-3541 (crash in std::vector >::reserve)
2013-12-12 07:24:13 +02:00
f3a50a5084
MAINT-3541 (crash in std::vector >::reserve)
2013-12-12 07:24:13 +02:00
5bef957159
MAINT-3530 : Add viewer checkbox to extend parcel entry limits to a higher ceiling
2013-12-06 15:44:18 -08:00
b2d769534c
Code review updates. All comments so far.
2013-11-18 13:33:19 -05:00
d191585a3e
Merge. Refresh from viewer-release after 3.6.10 release
2013-11-12 14:06:38 -05:00
241259820c
MAINT-3269 FIXED crash in LLMessageSystem::callExceptionFunc
2013-11-12 20:05:45 +02:00
fe518bde8e
merge with release
2013-11-06 17:22:04 -08:00
a54a56118a
MAINT-3374 FIXED Don't show username after display name if this setting is disabled.
2013-11-06 11:42:48 +02:00
aaf6c7954d
MAINT-3374 FIXED Don't show username after display name if this setting is disabled.
2013-11-06 11:42:48 +02:00
555cf227ff
trivial: fix several weird compiling errors.
2013-10-25 10:29:45 -06:00
318a1eca57
more buildfix stuff
2013-10-21 11:24:35 -07:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
9c313aea13
merge changes for DRTVWR-336
2013-10-15 17:47:37 -04:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
6f5790da38
Merge. Pull in viewer-release after 3.6.7 release.
2013-10-04 15:36:52 -04:00
1e32b9dd33
Pull merge of lindenlab/viewer-release
2013-10-04 09:47:26 -07:00
1e0069b88d
Fix bug exposed by GCC 4.7.
...
Some compilers will happly convert time_t to a bool, therefore time_t if_modified_since gets passed as bool follow_redirects
instead of time_t if_modified_since.
Result of this bug is all files are download with each startup of the client, causing increased server load.
2014-01-03 01:39:09 -05: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
b2c25178dd
More contact sets cleanup
2013-12-14 00:22:07 -07:00
238e858223
Add single quotes to aliased names
2013-12-12 12:48:36 -07: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
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
a7aed07a5b
broke out llunit.h into llunittype.h and llunits.h for unit declarations
...
changed unit declarations macros to make a lot more sense
2013-08-27 13:41:19 -07:00
a8d5b070b0
merging viewer release
2013-08-22 14:58:10 -07:00
c42a91421f
merge changes for 3.6.3-release
2013-08-20 10:37:10 -04:00
1616b73ef3
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-08-19 16:12:07 -06:00
d8c02bf062
Merge
2013-08-19 16:09:28 -06:00
612892b45a
SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 ms
...
continued conversion to units system
made units perform type promotion correctly and preserve type in arithmetic
e.g. can now do LLVector3 in units
added typedefs for remaining common unit types, including implicits
2013-08-18 22:30:27 -07:00
Tank_Master