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 |
|
Josh Bell
|
0277259455
|
svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-04-11 17:54:18 +00:00 |
|
Josh Bell
|
64395d2159
|
Effectively: merge 59238:59702 Branch_1-13-4 --> release EXCEPT for the back out (r59497) and re-patch (r59531) of upload-queue, and fixes merged directly from Maintenance.
merge -r 59328:59428 Branch_1-13-4 --> release
* address regex needs "s" option to support multiline addresses. Patched previously, not sure how it got dropped.
* added new promo code to accommodate printer error
* Fix for SL-37108 "SVC-55: look at may be broken"
* Paired/reviewed with Qarl
* Release notes for Release Notes for 1.13.4(59329)
* merge release-candidate@58928 long-live-legacy-particles@59317 -> Branch_1-13-14
SKIP -r 59428:59437 (temporary), 59437:59465 (from release), 59465:59497 (back out of upload-queue)
merge -r 59497:59510 Branch_1-13-4 --> release
* SL-37932 legacy particle clean up
* SL-33228 llParticleSystem( [] ) may not shut down reliably
* SL-37909 llParticleSystem([ ]) bug now affects unlinked and root prims
SKIP -r 59510:59531 (re-patch of upload-queue)
merge -r 59531:59585 Branch_1-13-4 --> release
* blacklist and release notes updates
SKIP -r 59585:59656 (patches from maintenance)
merge -r 59656:59691 Branch_1-13-4 --> release
* blacklist and release notes updates
SKIP -r 59691:59702 (already ported to release)
|
2007-03-26 17:30:51 +00:00 |
|
Josh Bell
|
00dbacb215
|
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate@59163 --> release
|
2007-03-14 23:03:50 +00:00 |
|
Steven Bennetts
|
c4059553af
|
SKIPPED 58849. merge -r 58856:58859 maintenance -> release
|
2007-03-07 01:16:27 +00:00 |
|
Steven Bennetts
|
4dabd9c047
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +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
|
ad94bca0d2
|
merge -r 56696:57082 Branch_1-13-2
|
2007-01-24 20:21:23 +00:00 |
|
Steven Bennetts
|
73f0b5029a
|
merge -r 56738:56842 maintenance.
|
2007-01-18 00:36:25 +00:00 |
|
Josh Bell
|
d60f16540d
|
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431
This turned up the following "lost" changes:
llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly
llfontgl.cpp (from maintenance r50207) - whitespace only
inventorybridge.cpp (property - non-executable)
skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL
|
2007-01-04 02:04:29 +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 |