Commit Graph

25 Commits (095aca3eaea4cbc2237d2b3ad3d63fdad54eb2b7)

Author SHA1 Message Date
Kyle Ambroff 095aca3eae svn merge -r98039:98711 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
Merging various security fixes from Branch_1-24-Server.

Related to RequestXfer exploit:
* DEV-21706 (SEC-188): llParticleSystem can be used to obtain asset id.
* DEV-21767: Migrate RequestXfer to TCP-only
* DEV-21765: Fix RequestXfer traversal exploit
* DEV-21775: LLXferManager::processFileRequest() still has file vulnerabilities

Various fixes:
* fix for VFS memory corruption in llvfs.
* Bump server version to 1.24.9.

Landstore fixes:
* Passing locale to fulfill-order-item from region reservation fulfillment.
2008-10-07 20:50:30 +00:00
Dave Hiller 9a7d68cfce svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated 2008-07-31 12:15:15 +00:00
Karl Steifvater 52562e2e66 svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge
QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL
2008-07-23 21:20:19 +00:00
Josh Bell 35b4a91129 svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> release
Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation.
2008-07-22 20:55:02 +00:00
Karl Steifvater df4f20d4f5 merge uv-picking branch.
svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4
2008-07-22 20:12:37 +00:00
James Cook ed386ae547 merge support-featurettes-snapshot-merge-2 for QAR-754, includes:
* featurettes-4 89061:89589 (which is all of featurettes-1, -2, and -3, and part of -4)
    * gteam-showstoppers-3 91950:91951 (which is all of gteam-showstoppers-1, -2, and -3)
    * featurettes-5 92149:92150 (patch for last line of chat text not visible in chat history, DEV-17771)
    * snapshot-3 91988:91991 (which is all of snapshot-1, -2, and -3)

Merging revisions 92190-92387 of svn+ssh://svn.lindenlab.com/svn/linden/branches/support-featurettes-snapshot-merge-2 into release, respecting ancestry

* QAR-590 Merge Lock Request for Support Sprint
* QAR-627 Merge snapshot improvements
* QAR-686 Merge Lock request for Featurettes
2008-07-18 17:50:25 +00:00
Josh Bell a089a401ee svn merge -r 84911:86069 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-21-Server --> release
Backport fixes made in the production branch to the trunk now that it is live on the grid:
* DEV-14443 Launcher not producing colo prefix when looking up sim class
* DEV-10840 "/etc/init.d/backbone stop" returns before all child backbones exited; "backbone restart" results in defunct children
* DEV-12558: Able to make anyone's object shout error messages
* QAR-483 user start location migration prelude
* QAR-490 havok4-6
* Revert havok4-5/4-6 code changes causing parcel access check issues
* Revert QAR-277 sqlite-backbone
* DEV-12357 SEC-53: Script that crashes regions
* QAR-486 New proc and query for Web Classifieds Fix
2008-04-28 19:40:54 +00:00
Leyla Farazha b73ad51784 svn merge -r84080:84255 svn+ssh://svn/svn/linden/branches/intermezzo-9
QAR-431
2008-04-08 21:04:41 +00:00
Kelly Washington dc48f1c741 svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
HAVOK4 IN TEH HOUSE!!11!!ONE!!
If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this.

QAR-448
2008-04-03 22:50:22 +00:00
Josh Bell 98fd90ddd6 svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release
QAR-275 Parcel Media

Sam made me do it.
2008-02-14 01:45:59 +00:00
Jon Wolk 7dd08303a3 svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134 2007-12-19 00:56:59 +00:00
Don Kjer 9754d265eb EFFECTIVE MERGE: svn merge -r 73781:75018 svn+ssh://svn/svn/linden/branches/FixGroupVotes into release
ACTUAL MERGE: svn merge -r 75163:75166 svn+ssh://svn/svn/linden/qa/FixGroupVotes-merge-75160 into release
2007-12-06 18:18:35 +00:00
Josh Bell e5057b4747 svn merge -r 73201:74169 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Server --> release 2007-11-21 02:29:23 +00:00
Kent Quirk 138bf17c3c merge of age verification changes from QAR-76 to release; changes were originally made on the age_verification_2007xxxx branches; final changes were QA'd on age_verification_20071112. 2007-11-15 19:10:29 +00:00
Leyla Farazha 1e7917fa89 Committing viewer-auth-server into release svn merge -r72818:72835 svn+ssh://svn/svn/linden/branches/viewer-auth-server-2 2007-11-02 21:26:41 +00:00
Melinda Green 07c24d0437 Passed QA, merging minifriends-3:70006 back to release 2007-09-19 21:28:44 +00:00
Sam Kolb b2595c369f Merge sl-search-opt-in back into the release branch
Reviewed by Josh and Don
2007-08-30 22:11:52 +00:00
Christian Goetze ce0a5fe145 EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-08-21 22:17:53 +00:00
Tess Chu 3b2515fd5f merge -r 66233:67472 svn+ssh://svn/svn/linden/branches/het-grid-4 Paired by Tess and Leyla.
Added tests to version manager and fixed failed tests.  Paired by rdw and Tess.
2007-08-10 02:15:37 +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
Brad Kittenbrink 029130bf9c svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release 2007-05-23 21:17:34 +00:00
Don Kjer 4ecb9cb63e svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release 2007-05-01 21:39:25 +00:00
Steven Bennetts 934e15973e merge release@57486 release-candidate@57503 2007-01-31 19:36:32 +00:00
Steven Bennetts 71d28bdbf0 merge release@56803 release-candidate@56833 2007-01-17 23:02:00 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00