23fd31faf6
Merge Firestorm LGPL
2018-09-27 11:59:30 +02:00
95aa7f7583
Fix log output - we don't need an escaped output
2018-09-27 11:47:42 +02:00
d5fdcd67ab
Merge axon
2018-09-25 17:45:20 +02:00
d93b92ec1d
Merge viewer-bear
2018-09-12 20:13:12 +02:00
d6cec8d68d
SL-944 - enabled log types consistent notation in xml and cpp
2018-09-07 16:00:43 +01:00
f1d4e788e7
SL-967 simplify viewer log file field syntax
...
MAINT-8991: only escape log message characters once, add unit test
remove extra log line created by LL_ERRS
document that tags may not contain spaces
2018-08-29 16:43:45 -04:00
36e89143b7
Backed out changeset: 5b0f20062633
2018-08-28 22:25:18 +03:00
e3d5a6df0a
SL-944 - mac build error fix: wants override to be used throughout a class if it is used at all
2018-08-27 14:22:42 +01:00
9ae973ec5b
SL-944 - mac build error fix: wants override to be used throughout a class if it is used at all
2018-08-27 14:22:42 +01:00
35b12f7547
SL-944 - logcontrol options to control which log recorders get used. This can be useful for performance reasons when especially verbose debug logging is needed.
2018-08-24 21:55:07 +01:00
9c6678b5e7
SL-944 - logcontrol options to control which log recorders get used. This can be useful for performance reasons when especially verbose debug logging is needed.
2018-08-24 21:55:07 +01:00
6f7a3cdc74
Merge viewer-bear
2018-08-22 14:47:49 +02:00
7aaaabdea7
MAINT-8991 Escape newlines in log entries
2018-08-17 16:14:03 +03:00
6ce09ad712
merge
2018-08-02 21:54:09 +01:00
c1f3b20f55
Merge axon
2018-06-20 19:07:46 +02:00
edf6795eda
SL-915, MAINT-8554 - cleanup/reorg, added encroachment fix info to DebugAnimatedObjects output
2018-06-13 21:49:24 +01:00
106d34da3a
Merge viewer-neko
2018-06-12 21:54:15 +02:00
c3e588c228
Pull fixes for Mac OSX 10.14
2018-06-11 18:32:24 +02:00
887638c4d2
SL-915 - fix for crash when logcontrol file reloaded
2018-06-11 13:55:34 +01:00
430f9420cf
SL-915 - more on dynamic extent tracking, possible fix for 32-bit crash issues
2018-06-07 22:18:15 +01:00
88da45148e
Better fix for OSX 10.14 libc++abi demangling crash on mem shenanigans.
...
Silence nagging about running launcher for non-release for download builds.
Tweak newview CMake to use executable instead of SL_Launcher and
re-enable debugging within Xcode.
2018-06-07 22:14:46 +01:00
1c4decadfe
Disable name demangling via libc++abi on OS X to avoid malloc abort trap on OS X 10.14 Mojave
2018-06-07 01:22:49 +01:00
7cc408a5cd
Merge.
2018-04-10 12:33:45 +02:00
3ea9a01423
Change pointer to member where possible and do a bit of cleanup in lerror (move the mutexex in there and us the LLMutextTryLock rather than a custom class).
2018-04-06 09:49:32 +02:00
ef20e3f523
Replace ARP Mutex and Condition with std::mutx and std::conditional_variable
2018-04-05 12:02:12 +02:00
d7c8678c3a
merge 5.1.0-release
2018-01-17 12:43:28 -05:00
6131e12bf6
Merge Firestorm LGPL
2017-11-12 11:23:26 +01:00
6a6d6efe22
Merge viewer-vivox
2017-08-23 15:54:53 +02:00
fa53653e60
fix separator between tags and file/function
2017-07-24 14:49:56 -04:00
1baf1f5091
Merge Firestorm LGPL
2017-06-20 23:24:35 +02:00
347015be33
fix presentation of log tags for better searchability
2017-06-20 17:03:20 -04:00
a3066b7375
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-06-20 16:11:33 -04:00
915496bbea
Merge viewer-vivox
2017-03-21 22:14:02 +01:00
f579b94138
DRTVWR-418: Ignore logging that requires resurrecting singletons.
...
The logging subsystem depends on two different LLSingletons for some reason.
It turns out to be very difficult to completely avoid executing any logging
calls after the LLSingletonBase::deleteAll(), but we really don't want to
resurrect those LLSingletons so late in the run for a couple stragglers.
Introduce LLSingleton::wasDeleted() query method, and use it in logging
subsystem to simply bypass last-millisecond logging requests.
2017-03-13 14:09:14 -04:00
1a8c8df686
DRTVWR-418: Ignore logging that requires resurrecting singletons.
...
The logging subsystem depends on two different LLSingletons for some reason.
It turns out to be very difficult to completely avoid executing any logging
calls after the LLSingletonBase::deleteAll(), but we really don't want to
resurrect those LLSingletons so late in the run for a couple stragglers.
Introduce LLSingleton::wasDeleted() query method, and use it in logging
subsystem to simply bypass last-millisecond logging requests.
2017-03-13 14:09:14 -04:00
e16b1a6093
Undo some fixes so the LL patches apply cleanly
2017-10-26 12:07:53 +02:00
dd63291355
construct tag string without using +=
2017-03-09 17:56:30 -05:00
e479d51068
experiment reformatting of tags in log lines
2017-03-09 14:16:33 -05:00
07d91c5d19
Merge asset-http
2017-03-06 22:48:05 +01:00
f70abb4ad6
SL-409 - added tracking for bytes fetched to viewer assets metrics (does not currently work for textures)
2017-03-03 15:14:09 -05:00
0a7fd3686a
Look for logcontrol-dev.xml in the user settings directory
2017-02-27 09:52:50 -05:00
8c083cf771
Merge Firestorm LGPL
2016-12-05 22:40:59 +01:00
2abd0eef41
Merged in lindenlab/viewer-release
...
DRTVWR-412 Bento (avatar skeleton extensions)
2016-12-05 21:51:29 +02:00
aa25acc045
Merge Firestorm LGPL
2016-11-30 09:43:52 +01:00
5351c445a8
Merge Firestorm LGPL
2016-11-29 19:26:31 +01:00
5a58635b64
Merge Firestorm LGPL
2016-11-16 16:11:56 +01:00
d31596db6a
merge
2016-11-16 08:39:41 -05:00
c182741596
Merge viewer-lynx
2016-11-16 09:55:54 +01:00
7fceb3a63f
Merged in lindenlab/viewer-cleanup
2016-11-14 22:04:37 +02:00
79c0b8a9b5
Merge viewer-bear
2016-10-19 10:56:32 +02:00
Ansariel