ae564140c0
Merge
2014-04-22 12:19:28 -06:00
e5dae42252
Fix for MAINT-5707 bad breakpad behavior with teleport links
2014-04-14 15:11:42 -07:00
98aabdc176
merge with release
2014-04-07 19:09:40 -07:00
efc41f95bb
Removed debug line.
2014-01-22 10:23:50 -08:00
d223687fb8
char vs wchar_t FIGHT
2014-01-22 10:21:29 -08:00
ce2cd00cc5
Removed debugging code.
2013-12-04 19:57:11 -08:00
6809348125
Creating a cleaner branch
2013-12-03 17:06:06 -08: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
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
903996e8d4
Google Breakpad Fix
2013-03-28 19:25:51 -07:00
5d7417b40e
STORM-422 FIXED Added command line option "-disablecrashlogger" to disable crash logger.
...
This is a patch originally written by Robin Cornelius.
I made it work with Google Breakpad.
2010-11-02 20:26:38 +02:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
4fb7738027
Write breakpad minidump files to the SL log directory.
...
Also, clean out old minidump files when we start up.
2010-05-28 15:10:52 +01:00
05761d7853
Removed the SyncErrorHandler from llapp and llappviewer*.
...
This was only used for the Linux client to dump a stack trace to
stack_trace.log, which is no longer needed now that we are using
Google Breakpad.
I also removed all of the stack printing code from llappviewerlinux.cpp.
2010-05-27 15:04:06 +01:00
a63b6dd93c
Hooked up Google Breakpad for the Linux client too.
...
Using Alain's Darwin reporter callback was all that was needed.
Also replaced the call that exposed the breakpad exception class
with a call to just write out the minidump, as that was the only
reason for exposing it. Now clients don't need to know about
Google Breakpad.
2010-05-26 14:43:27 +01:00
5a52c5eb8a
Mac crash behavior matches windows and linux: report on crash (not after restart). This is OK because we use Breakpad generated minidumps instead of OS generated ones.
2010-05-25 13:32:12 -07:00
1077ab49c1
Just enough hackery to get minidumps into Wind'ohs crash reports. Code clean up needed.
2010-05-24 15:19:33 -07:00
ba809777e5
New google breakpad package for windows with winsock2 fix, and DLL CRT library usage.
...
Also moved headers into libraries/include/google_breakpad.
Mac and linux packages to come shortly.
2010-05-21 14:39:55 -07:00
719edddf04
Switch Darwin to use breakpad minidump rather than os generated crash stack.
2010-05-21 09:38:29 -07:00
b1b5a11bb0
EXT-3075 : Remove swear words from comments across viewer
...
This bugs me in a minor way. Did a search-and-cleanup on various swear words.
2010-03-29 15:33:48 -04:00
89201ba29a
Fix for mac build post-merge.
2009-12-14 16:05:13 -05:00
7c69928ff8
Fixups for things broken after the last merge and for the linux build.
2009-12-07 18:43:47 -08: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
bae94e4340
Merged login-api with viewer-2.0.0-3 up through r132290.
2009-09-01 12:21:51 -04: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
1af41b3ba7
Fixes to build on linux for DEV-35401.
...
Moves libllcommon.so to a staging dir for unit tests to work
and gets rid of LL_COMMON_API in forward declarations
2009-07-30 18:52:34 -07: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
15a6d273cc
svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-5-r108113
2009-01-17 01:29:45 +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
189599b6ff
Merging from server/server-1.25 back to trunk.
...
svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25
Conflicts resolved by Prospero, except for one scary conflict in
SendConfirmationEmail.php which was resolved by jarv.
2008-12-04 22:36:34 +00:00
d85247e63e
QAR-449 Viewer 1.20 RC 0
...
merge Branch_1-20-Viewer -r 84060 : 84432 -> release
2008-04-17 02:42:27 +00:00
d2597d35cf
Undid previous commit (bogus merge)
2008-04-17 02:25:04 +00:00
c57beb8b4b
QAR-449 Viewer 1.20 RC 0
...
merge Branch_1-20-Viewer -r 84060 : 84432 -> release
2008-04-17 02:06:30 +00:00
fb42741b62
QAR-455 Launcher and Heartbeat fixes MergeMe
...
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@84853
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/signalcrap-merge1
2008-04-16 09:29:07 +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
4617a37edf
corrected, removed, and updated comments throughout the code to be more useful. no code changes. SL-13762
2007-01-03 21:05:41 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Xiaohong Bao