b73ad51784
svn merge -r84080:84255 svn+ssh://svn/svn/linden/branches/intermezzo-9
...
QAR-431
2008-04-08 21:04:41 +00:00
069b12a21b
If the correct wy doesn't work, hack it instead -sigh-
2008-03-27 23:58:18 +00:00
bbbaca2af1
Add dir_list attribute, populate it and use it to set access permissions
2008-03-27 21:07:50 +00:00
e62bb20188
QAR-277 svn merge -r83278:83442 svn+ssh://svn.lindenlab.com/svn/linden/branches/sqlite-backbone-merge
2008-03-27 18:43:57 +00:00
25de7377c1
QAR-377 maintenance-6 merge:
...
svn merge -r 82602:82644 svn+ssh://svn/svn/linden/qa/maintenance-6-merge-82557 release/
2008-03-19 00:01:42 +00:00
c0c5bdbbb9
svn merge -r 82064:82066 svn+ssh://svn/svn/linden/qa/dev-11639-sandbox
...
Merge fix for DEV-11639 - fix for llsdhttp.py to work with newer eventlet API
2008-03-14 19:54:41 +00:00
d60c966bcf
svn merge -r81066:82130 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-03-13 20:00:55 +00:00
8eea75dc3f
svn merge -r 79841:79886 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-15 18:47:45 +00:00
446b7ecea2
Result of svn merge -r79554:79558 svn+ssh://svn/svn/linden/branches/merge-dp into release
2008-02-08 23:43:16 +00:00
8bd6a0b321
svn merge -r 79445:79449 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
2008-02-07 17:15:18 +00:00
d06e5e3519
svn merge -r 76642:76643 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-4-merge-76640
...
Redo of QAR-170, with correct range. Reviewed by CG.
2007-12-29 01:40:57 +00:00
facf67ae32
EFFECTIVE MERGE: svn merge -r 71520:73420 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-05 23:43:56 +00:00
7b7dd4e6f6
svn merge -r74808:74832 svn+ssh://svn/svn/linden/branches/qa-dpo-9a
2007-12-01 01:29:28 +00:00
5c53c187ff
Trivial change to not print an error from a library (was blocking use in CGIs). Suggested by donovan.
2007-11-30 00:53:21 +00:00
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
2f6c760624
svn merge -r 73926:74098 svn+ssh://svn/svn/linden/branches/viewer-auth-7
2007-11-20 02:53:43 +00:00
813b140d07
svn merge -r73880:73879 svn+ssh://svn/svn/linden/release. backing out viewer auth merge
2007-11-15 22:39:12 +00:00
291d99bc66
svn merge -r73220:73877 svn+ssh://svn/svn/linden/branches/viewer-auth-6
2007-11-15 19:22:19 +00:00
833e8d5c2a
svn merge -r 71403:72356 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-25 22:31:09 +00:00
b3b62c3b9e
Fixed obvious typo, paired with rdw.
2007-10-08 22:40:47 +00:00
fbfd85165c
Little trick to further sweep SL-56900 under the rug. Not reviewed, I wish 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-06 04:07:27 +00:00
5595a99623
Result of svn merge -r71162:71205 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-04 23:19:43 +00:00
9fc7049151
This should hide the problem in SL-56900. Reviewed by Donovan.
2007-10-03 23:20:12 +00:00
9763105427
Result of svn merge -r70716:70807 svn+ssh://svn/svn/linden/branches/open-py-libs into release.
2007-09-28 23:41:17 +00:00
910c792b00
svn merge -r70295:70503 svn+ssh://svn/svn/linden/branches/pylibs-freshen3
2007-09-26 14:41:36 +00:00
33ce57b485
Result of svn merge -r68268:69863 svn+ssh://svn/svn/linden/branches/entity-router into release.
2007-09-19 16:59:05 +00:00
80dfa222fd
Result of svn merge -r69150:69158 svn+ssh://svn/svn/linden/branches/named-queries-py3 into release.
2007-09-10 20:10:56 +00:00
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
b387b98bd0
Result of svn merge -r67150:67159 svn+ssh://svn/svn/linden/branches/mp-backbone-2 into release.
2007-08-02 19:05:10 +00:00
24c0e384fa
New mysql connection pool for Python, plus unit tests that verify that it's actually non-blocking. Some additional behavior in saranwrap, with tests that pass. Reviewd by Donovan.
2007-07-27 22:08:25 +00:00
9746cf5310
EFFECTIVE MERGE: svn merge -r 65485:66133 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-26 01:22:23 +00:00
4284da1787
fix up copyrights on asset gc files
2007-07-25 22:44:05 +00:00
87955ce1eb
asset garbage collection scripts
2007-07-25 17:35:44 +00:00
ce7682c2a4
svn merge -r64837:65485 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-18 21:22:40 +00:00
7964c6f7a5
Result of svn merge -r65183:65337 svn+ssh://svn/svn/linden/branches/python-shuffle into release. Also includes untabification of many python files.
2007-07-16 20:29:28 +00:00
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
98740db8fd
svn merge -r 59826:59968 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-04-04 19:49:24 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Leyla Farazha