Skip to content
Snippets Groups Projects
Commit 64395d21 authored by Josh Bell's avatar Josh Bell
Browse files

Effectively: merge 59238:59702 Branch_1-13-4 --> release EXCEPT for the back...

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)
parent 720eab7a
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment