Age | Commit message (Collapse) | Author |
|
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/sqlite-backbone-merge
|
|
svn merge -r 82602:82644 svn+ssh://svn/svn/linden/qa/maintenance-6-merge-82557 release/
|
|
Merge fix for DEV-11639 - fix for llsdhttp.py to work with newer eventlet API
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Viewer
Pick up last minute changes to 1.19.0:
* Access/Ban UI string "translation" fixes from 1.19.0.5
* Support for setting more scoped channel during builds/packaging, for A/B testing
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/self-contained-unit-test --> release
QAR-291/QAR-284/QAR-246 - Self-Contained Unit Test
|
|
into release
|
|
svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-5-merge-79386
QAR-242 merge of maintenance-5 (QAR-203)
* DEV-6548 Copy To Inventory fail to execute without any output feedback when Notecard has changes but not saved
* DEV-7600 Deleting someone else's object in god mode crashes sim
* DEV-5329 LLSD parsers should determine and set maximum parse sizes
* DEV-7473 Resolve instant message crash report
* DEV-2904 Presence Issues not (apparently) caused by scripted attachments
* DEV-7083 Investigate Null Folder IDs Bug that caused 470K inventory items with Null Folder IDS on the Grid
* DEV-2865 Textures/Snapshots in a notecard are opened again when you click copy to inventory.
* DEV-6612 VWR-3290: Linux scons build script doesn't work with distcc
* DEV-8002 c++ llsd notation parser accepts malformed data
* DEV-8001 c++ xml parse returns wrong number of elements parsed
* DEV-8089 Double delete in statc structured data parse functions
* DEV-5326 Any viewer can request presence information for any agent
* DEV-2378 python service builder does not sort query string
* DEV-7872 Block teleport off teen grid sub-estates like Schome Park / Open University
* DEV-4465 Add a "logfile" command line option to the sim to create log files
|
|
svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-4-merge-76640
Redo of QAR-170, with correct range. Reviewed by CG.
|
|
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
|
|
|
|
CGIs). Suggested by donovan.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Server --> release
|
|
|
|
auth merge
|
|
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Server --> release
Backport of fixes from production branch. Merge verified with QAR-41
|
|
|
|
this were otherwise, but it needs to be committed to release so the osiris external can pick it up and I don't want to have to manually create /var/www/.python-eggs anymore.
|
|
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
|
|
|
|
svn+ssh://svn/svn/linden/branches/open-py-libs into release.
|
|
|
|
svn+ssh://svn/svn/linden/branches/entity-router into release.
|
|
svn+ssh://svn/svn/linden/branches/named-queries-py3 into release.
|
|
Tess and Leyla.
Added tests to version manager and fixed failed tests. Paired by rdw and Tess.
|
|
svn+ssh://svn/svn/linden/branches/mp-backbone-2 into release.
|
|
actually non-blocking. Some additional behavior in saranwrap, with tests that pass. Reviewd by Donovan.
|
|
svn+ssh://svn/svn/linden/branches/maintenance into release
This includes fixes to the maintenance-r66133 branch, and sync'ing up with release@r66392
ACTUAL MERGE: svn merge -r 66394:66435 svn+ssh://svn/svn/linden/branches/release-r66392 into release
EQUIVALENT TO: svn merge -r 65485:66434 svn+ssh://svn/svn/linden/branches/maintenance-r66133 into release (plus branch sync'ing)
|
|
|
|
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
(only inside indra)
(josh) Original log message was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
|
|
svn+ssh://svn/svn/linden/branches/python-shuffle into release. Also includes untabification of many python files.
|
|
svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
|
|