Oz Linden
|
c8726aba30
|
remove execute permission from many files that should not have it
|
2015-11-10 09:48:56 -05:00 |
|
Aura Linden
|
3d4acb535d
|
Appears to fix MAINT-4184
|
2014-07-22 17:24:00 -07:00 |
|
Richard Linden
|
80dfbbaacd
|
merge from viewer-release
|
2013-10-08 11:59:24 -07:00 |
|
Richard Linden
|
25937040de
|
SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 ms
converted many values over to units system in effort to track down
source of 0 ping
|
2013-08-16 12:38:12 -07:00 |
|
Richard Linden
|
e340009fc5
|
second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
|
2013-08-09 17:11:19 -07:00 |
|
simon
|
ee2fce8790
|
Merge downstream code and viewer-beta
|
2013-05-09 14:10:45 -07:00 |
|
simon
|
9c371c1209
|
Clean up transfer manager code and log messages. Reviewed by Kelly
|
2013-04-11 13:27:11 -07:00 |
|
Graham Madarasz
|
bf6182daa8
|
Update Mac and Windows breakpad builds to latest
|
2013-03-29 07:50:08 -07:00 |
|
Oz Linden
|
a5619d16f7
|
correct licenses (fix problem with license change merge)
|
2010-10-13 07:24:37 -04:00 |
|
Tofu Linden
|
05e15ccb82
|
merge from viewer2.
|
2010-02-04 11:44:11 +00:00 |
|
Tofu Linden
|
4e73292e2c
|
CID-279
Checker: UNINIT_CTOR
Function: LLTransferTarget::LLTransferTarget(e_transfer_target_type, const LLUUID &, e_transfer_source_type)
File: /indra/llmessage/lltransfermanager.cpp
|
2010-02-03 20:14:57 +00:00 |
|
Tofu Linden
|
5a34cf1af8
|
Merge from viewer2 trunk.
|
2010-01-28 12:48:48 -08:00 |
|
Tofu Linden
|
e67d2bb555
|
CID-110
Checker: MISSING_BREAK
Function: LLTransferSourceChannel::updateTransfers()
File: /indra/llmessage/lltransfermanager.cpp
not a bug, commented.
|
2010-01-27 13:37:45 -08:00 |
|
David Parks
|
3e80fa3dbc
|
Sync up with render-pipeline-7 ignore-dead-branch
|
2009-11-02 19:55:37 +00:00 |
|
Aaron Brashears
|
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 |
|
Steven Bennetts
|
875606a04d
|
QAR-566 maint-viewer-5-merge-2
Effective merge: release@84102 maint-viewer-5@86348 -> maint-viewer-5-merge-2
Actual merge maint-viewer-5-merge-2 -r 87239 : 87246 -> release
|
2008-05-11 20:56:42 +00:00 |
|
Don Kjer
|
facf67ae32
|
EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release
ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release
|
2007-12-05 23:43:56 +00:00 |
|
Aaron Brashears
|
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 |
|
Tess Chu
|
57b8fef824
|
svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
|
2007-07-11 21:29:02 +00:00 |
|
Don Kjer
|
1c909afe39
|
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-05-02 21:24:47 +00:00 |
|
Steven Bennetts
|
4dabd9c047
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
Josh Bell
|
7dada07dba
|
svn merge -r 57620:58007 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
|
2007-02-20 22:02:36 +00:00 |
|
Aaron Brashears
|
305c74d516
|
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
|
2007-02-02 17:28:58 +00:00 |
|
Steven Bennetts
|
71d28bdbf0
|
merge release@56803 release-candidate@56833
|
2007-01-17 23:02:00 +00:00 |
|
Aaron Brashears
|
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 |
|
James Cook
|
420b91db29
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |