0b1259a084
no implicit conversion from ofsteam to bool in VS2013!!!!
2014-12-09 17:29:07 -08:00
f4bfb1aadf
Merge LL V3.7.9 (AIS3 + SSA)
2014-10-22 02:02:08 +02:00
08e83a341e
MAINT-4009: Final pass refactoring to eliminate memory allocation related to error reporting that is not properly cleaned up.
2014-05-17 00:41:36 +01:00
34b2f2d1f8
MAINT-4009: First pass refactoring to eliminate memory related to error reporting that is not properly cleaned up.
2014-05-16 22:44:25 +01:00
37d620463b
MAINT-4009: Cleaning up the error callstacks memory before app quit.
2014-04-28 19:18:47 +01:00
b31bfdba37
MAINT-4009: Converting the Globals class within llerror to be derived from LLSingleton so that it may be cleaned up properly on app exit.
2014-04-26 01:47:41 +01:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
66674e281d
Ugly (temporary) workaround to get the viewer build against the havok stub again.
2014-07-15 21:35:00 +02:00
e0974593d3
Fix some 0-pointer crashes we got with last merge.
2014-06-10 22:42:21 +02:00
81f714e433
Correct merge error in llerror.cpp.
2014-06-10 10:46:51 +02:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
ba0b11fee1
Fix build problem
2014-02-20 19:45:47 +02: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
e6c85c46c4
MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:
...
- memory leaks fixing;
2014-02-05 20:45:09 +02: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
7ab616c187
BUILDFIX: fix for windows unit test failures...don't do unnecessary
...
manipulation of callsite strings in llerror
2013-08-26 19:58:29 -07:00
235cc39293
BUILDFIX: reverted some debugging changes to llerror.cpp
2013-08-23 14:22:01 -07:00
a77f424945
BUILDFIX: fix for crashes in unit tests on mac and linux
2013-08-23 13:41:51 -07:00
b1419bfbf0
BUILDFIX: attempted fix for crash on exit in llsdserialize test
2013-08-22 16:56:14 -07:00
da030893dd
BUILDFIX: gcc fixes
2013-08-14 17:22:29 -07:00
cc31b4ae79
SH-4399 FIX: Interesting: Texture console MB Bound 0/384 and texture queue bounces once per second
...
SH-4346 FIX: Interesting: some integer Statistics are displayed as floating point after crossing region boundary
made llerrs/infos/etc properly variadic wrt tags
LL_INFOS("A", "B", "C") works, for example
fixed unit tests
remove llsimplestat
2013-08-12 20:05:16 -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
910874a7e3
more cleanup
2013-07-30 19:14:19 -07:00
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
1e8f9fd80d
SH-4376 FIX: Interesting: in Statistics, replace the text "0" with "n/a" when
...
there are no samples during the time period.
added hasValue to SampleAccumulator so we don't print a value when we don't have
a single sample yet
added some disabled log output for scene load timing
2013-07-24 19:36:43 -07:00
bc6070bd19
MAINT-2740 more comment grooming and NULL string guard
2013-06-05 07:38:54 -07:00
a45860fd66
MAINT-2740 put debug output back with guard of debugger presence per Nat review suggestion
2013-06-04 17:12:46 -07:00
0ce3d2e1cc
MAINT-2740 convert to std::string based API for OutputDebug wrapper cleanliness after sage counsel (slight refrain)
2013-06-04 14:17:34 -07:00
2750e86beb
MAINT-2740 and MAINT-2672 rework after code review for 2740 fix and include 2672 fix needed for doing local integ tests
2013-06-04 12:57:03 -07:00
97a2171ea8
MAINT-2740 make use of OsOutputDebugString _DEBUG only to avoid interactions between Win 32-bit SEH and boost coroutine fiber stack handling
2013-06-04 09:05:23 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
c937d8ab44
More VS2013 compile fixes
2013-10-28 18:34:50 -07:00
507d83b8c3
Merge.
2013-07-10 20:45:31 +02:00
50364b9566
Add log throttling to stop log spam flooding log files.
2013-07-10 20:43:18 +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
0f958faacd
merge up to 3.3.3-release + pathfinding
2012-06-25 17:16:29 -04:00
f92e7d30a8
Add logging during tests (debug level, to test-specific files)
2012-06-24 07:27:34 -04:00
01c7d1eafb
Merge LL pathfinding
...
with help from Armin and NickyD
2012-08-06 18:14:39 -07:00
991d43709c
merge LL 3.3.3 beta
2012-06-16 07:22:27 -07:00
f02ded46fe
Make test.cpp support LOGFAIL env var: only failed tests show log.
...
Set LOGFAIL= one of ALL, DEBUG, INFO, WARN, ERROR, NONE. A passing test will
run silently, as now; but a failing test will replay log output at the
specified level or higher.
While at it, support LOGTEST environment variable, same values. This is like
setting --debug (or -d), but allows specifying an arbitrary level -- and,
unlike --debug, can be set for a TeamCity build config without modifying any
scripts or code.
Publish LLError::decodeLevel(std::string), previously private to llerror.cpp.
2012-03-05 13:07:14 -05:00
8a3aa3f6ca
STORM-1790 Provide a Develop sub-menu to change the default logging level
...
co-authored with Zi Ree
2011-12-23 12:06:36 -05:00
161c1b019f
Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
...
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
fe14e50a45
Fixed numerous comment spelling errors in llerror.cpp and llerror.h
2011-08-08 16:19:39 -04:00
205747903f
Reintroduce Socks5 support with latest LL code from v-dev (Work done by Log Linden)
2011-09-03 00:49:31 -07:00
6a0aad5758
Use a buffer for debug console output (improves speed on Windows when console is enabled). Ported from Singularity, patch by Shyotl
2011-03-16 09:00:53 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
15b855409a
Fix a long-suffering logging unit test failure, re-enable the test.
...
This makes logs look less scary on Linux, in-line with other platforms.
2010-06-04 13:58:19 +01:00
32be2a798b
for EXT-7181: create a cheaper call stack tracing tool.
2010-04-30 15:42:48 -06:00
1ea60591a9
Refactoring of llviewerprecompiledheaders.h to hopefully increase stability
...
and reduce unnecessary dependencies and incredibuild wedging. Hopefully in
the long run this will reduce build time. Also cleaned up a lot of header
file usage to conform better to the coding standard.
reviewed by james and steve.
2009-11-13 20:33:59 -05:00
a1ed9ccf73
Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> viewer-2.0.0-3
...
Includes:
* DEV-31909 VWR-13251: Revise lscript_library.cpp to allow localization of LSL editor hovertips
* DEV-21938 llSHA1String does not appear where expected in the dropdown "Insert" menu in the LSL editor
* Some cleanup to llerror so that it doesn't depend on llfixedbuffer
* A few misc. server specific changes not related to the texture-pipeline changes (llapp, lloptioninterface)
2009-08-29 06:23:41 +00:00
087bd26553
Merge of QAR-1383 event-system-7 into trunk.
...
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
2009-06-04 16:24:21 +00:00
9dfe0ca9a0
svn merge -r121194:121210
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1
QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
2009-05-22 09:58:47 +00:00
6df2755ba6
Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462
2009-05-18 23:38:35 +00:00
b01c75cb42
svn merge -r117314:117337
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +00:00
abdc99f21b
Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
...
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-02-18 21:10:16 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
fb793870fe
QAR-1142 merging 1.22 RC0-RC4 changes.
...
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
2008-12-23 19:39:58 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
ad33281007
QAR-650 - Viewer RC 9 merge -> release (post cmake)
...
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06 22:43:38 +00:00
9db949eec3
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
...
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00
3855896097
EFFECTIVE MERGES:
...
svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release
svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release
ACTUAL MERGE: svn merge -r 87631:87698 svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release
dataserver-is-deprecated
2008-05-19 17:02:33 +00:00
e77de5d685
Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge .
...
Passed QA as part of QAR-491.
2008-05-14 21:37:13 +00:00
d273ba2ce2
Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated
2008-05-07 20:48:38 +00:00
e1e1212daa
QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated
2008-05-07 17:17:42 +00:00
25de7377c1
QAR-377 maintenance-6 merge:
...
svn merge -r 82602:82644 svn+ssh://svn/svn/linden/qa/maintenance-6-merge-82557 release/
2008-03-19 00:01:42 +00:00
5595a99623
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04 23:19:43 +00:00
4942a7b779
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
2007-10-04 16:31:48 +00:00
13c391f198
EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/maintenance
...
ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync
EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999
2007-09-14 21:13:20 +00:00
680667d4bd
svn merge -r 62560:62559 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
...
Revert bad patch for VWR-849 / SL-43759
2007-06-12 21:41:54 +00:00
e61a10ec5b
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-06-04 18:46:59 +00:00
3e9872a297
merge -r61423:62602 svn/branches/maintenance --> release
2007-05-30 17:39:09 +00:00
204081b8e2
Ported MarkL's fix for SL-38277 to release from message-liberation-5. svn merge -r59784:59785 svn+ssh://svn.lindenlab.com/svn/linden/branches/message-liberation-5 into svn+ssh://svn.lindenlab.com/svn/linden/release.
2007-03-27 20:41:40 +00:00
1d18eb043a
merge -r57991:58444 branches/distribute/user/mute to release
2007-03-05 22:09:52 +00:00
4dabd9c047
merge release@58699 beta-1-14-0@58707 -> release
2007-03-02 21:25:50 +00:00
b5342e238a
svn merge -r58163:58241 loadstone-sim-standby, reduces database load from standby sims polling the database for a region to run
2007-02-27 17:52:10 +00:00
d0d4670f49
merge in of error-refactor-3
...
concludes (fixes) SL-31187
pair programmed and reviewed by markl and karen
2007-02-06 00:57:33 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
callum_linden