summaryrefslogtreecommitdiff
path: root/indra/lib
AgeCommit message (Collapse)Author
2008-05-07Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 ↵Brian McGroarty
svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated
2008-05-07QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 ↵Brian McGroarty
svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated
2008-05-06svn merge -r86582:86825 ↵Kartic Krishnamurthy
svn+ssh://svn/svn/linden/branches/nq-extension-for-merge-1 . Original Jira: https://jira.lindenlab.com/browse/DEV-11178 (Proposal: To rename named query files to take an extension .nq) Sandbox Jira: https://jira.lindenlab.com/browse/QAR-470 (Test a massive rename of named query files from being extensionless to having a .nq extension) Merge Buildme: https://jira.lindenlab.com/browse/QAR-473 Original Code Review: BillC
2008-04-28svn merge -r 84911:86069 ↵Josh Bell
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-08svn merge -r84080:84255 svn+ssh://svn/svn/linden/branches/intermezzo-9Leyla Farazha
QAR-431
2008-03-27If the correct wy doesn't work, hack it instead -sigh-Christian Goetze
2008-03-27Add dir_list attribute, populate it and use it to set access permissionsChristian Goetze
2008-03-27QAR-277 svn merge -r83278:83442 ↵Donovan Preston
svn+ssh://svn.lindenlab.com/svn/linden/branches/sqlite-backbone-merge
2008-03-19QAR-377 maintenance-6 merge:Brian McGroarty
svn merge -r 82602:82644 svn+ssh://svn/svn/linden/qa/maintenance-6-merge-82557 release/
2008-03-14svn merge -r 82064:82066 svn+ssh://svn/svn/linden/qa/dev-11639-sandboxJosh Bell
Merge fix for DEV-11639 - fix for llsdhttp.py to work with newer eventlet API
2008-03-13svn merge -r81066:82130 ↵Josh Bell
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
2008-02-15svn merge -r 79841:79886 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/self-contained-unit-test --> release QAR-291/QAR-284/QAR-246 - Self-Contained Unit Test
2008-02-08Result of svn merge -r79554:79558 svn+ssh://svn/svn/linden/branches/merge-dp ↵Aaron Brashears
into release
2008-02-07svn merge -r 79445:79449 ↵Josh Bell
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
2007-12-29svn merge -r 76642:76643 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-4-merge-76640 Redo of QAR-170, with correct range. Reviewed by CG.
2007-12-05EFFECTIVE MERGE: svn merge -r 71520:73420 ↵Don Kjer
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-01 svn merge -r74808:74832 svn+ssh://svn/svn/linden/branches/qa-dpo-9aChristian Goetze
2007-11-30Trivial change to not print an error from a library (was blocking use in ↵Josh Bell
CGIs). Suggested by donovan.
2007-11-21svn merge -r 73201:74169 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Server --> release
2007-11-20svn merge -r 73926:74098 svn+ssh://svn/svn/linden/branches/viewer-auth-7Tess Chu
2007-11-15svn merge -r73880:73879 svn+ssh://svn/svn/linden/release. backing out viewer ↵Tess Chu
auth merge
2007-11-15svn merge -r73220:73877 svn+ssh://svn/svn/linden/branches/viewer-auth-6Tess Chu
2007-10-25svn merge -r 71403:72356 ↵Josh Bell
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
2007-10-08Fixed obvious typo, paired with rdw.James Cook
2007-10-06Little trick to further sweep SL-56900 under the rug. Not reviewed, I wish ↵Ryan Williams
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.
2007-10-04Result of svn merge -r71162:71205 ↵Aaron Brashears
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-03This should hide the problem in SL-56900. Reviewed by Donovan.Ryan Williams
2007-09-28Result of svn merge -r70716:70807 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/open-py-libs into release.
2007-09-26svn merge -r70295:70503 svn+ssh://svn/svn/linden/branches/pylibs-freshen3Christian Goetze
2007-09-19Result of svn merge -r68268:69863 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/entity-router into release.
2007-09-10Result of svn merge -r69150:69158 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/named-queries-py3 into release.
2007-08-10merge -r 66233:67472 svn+ssh://svn/svn/linden/branches/het-grid-4 Paired by ↵Tess Chu
Tess and Leyla. Added tests to version manager and fixed failed tests. Paired by rdw and Tess.
2007-08-02Result of svn merge -r67150:67159 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/mp-backbone-2 into release.
2007-07-27New mysql connection pool for Python, plus unit tests that verify that it's ↵Ryan Williams
actually non-blocking. Some additional behavior in saranwrap, with tests that pass. Reviewd by Donovan.
2007-07-26EFFECTIVE MERGE: svn merge -r 65485:66133 ↵Don Kjer
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)
2007-07-25fix up copyrights on asset gc filesSeth Alves
2007-07-25asset garbage collection scriptsSeth Alves
2007-07-18svn merge -r64837:65485 ↵Bryan O'Sullivan
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.
2007-07-16Result of svn merge -r65183:65337 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/python-shuffle into release. Also includes untabification of many python files.
2007-07-11svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 ↵Tess Chu
svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
2007-04-04svn merge -r 59826:59968 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-01-02Print done when done.James Cook
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 16:28:59 +0000