livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
473 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

48 Commits (757e8e84f803ed0bf622bcdba1bd8dd74640999d)

Author SHA1 Message Date
Jon Wolk 852d36a2b7 Squeezing fix for DEV-16861: Tracebacks in backbone(multiagentchat) into release. 2 line change. Approved by josh 2008-06-18 22:22:23 +00:00
Steven Bennetts ad33281007 QAR-650 - Viewer RC 9 merge -> release (post cmake) 
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
 2008-06-06 22:43:38 +00:00
Ryan Williams 5f002b429b svn merge -r88806:88810 svn+ssh://svn.lindenlab.com/svn/linden/branches/escrow/liquid-banjo-05 into release 2008-06-02 23:25:14 +00:00
Bryan O'Sullivan 9db949eec3 svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge 
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
 2008-06-02 21:14:31 +00:00
Don Kjer 3855896097 EFFECTIVE MERGES: 
svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release
svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release

ACTUAL MERGE: svn merge -r 87631:87698  svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release

dataserver-is-deprecated
 2008-05-19 17:02:33 +00:00
Ryan Williams 52333fc830 svn merge -r87349:87423 svn+ssh://svn.lindenlab.com/svn/linden/branches/escrow/liquid-banjo-03-merge release dataserver-is-deprecated 2008-05-13 21:07:14 +00:00
Brian McGroarty d273ba2ce2 Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
Brian McGroarty e1e1212daa QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated 2008-05-07 17:17:42 +00:00
Kartic Krishnamurthy 4192700475 svn merge -r86582:86825 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-05-06 20:26:22 +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
Christian Goetze 069b12a21b If the correct wy doesn't work, hack it instead -sigh- 2008-03-27 23:58:18 +00:00
Christian Goetze bbbaca2af1 Add dir_list attribute, populate it and use it to set access permissions 2008-03-27 21:07:50 +00:00
Donovan Preston 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
Brian McGroarty 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
Josh Bell 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
Josh Bell 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
Josh Bell 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
Aaron Brashears 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
Josh Bell 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
Josh Bell 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
Don Kjer 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
Christian Goetze 7b7dd4e6f6 svn merge -r74808:74832 svn+ssh://svn/svn/linden/branches/qa-dpo-9a 2007-12-01 01:29:28 +00:00
Josh Bell 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
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
Tess Chu 2f6c760624 svn merge -r 73926:74098 svn+ssh://svn/svn/linden/branches/viewer-auth-7 2007-11-20 02:53:43 +00:00
Tess Chu 813b140d07 svn merge -r73880:73879 svn+ssh://svn/svn/linden/release. backing out viewer auth merge 2007-11-15 22:39:12 +00:00
Tess Chu 291d99bc66 svn merge -r73220:73877 svn+ssh://svn/svn/linden/branches/viewer-auth-6 2007-11-15 19:22:19 +00:00
Josh Bell 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
James Cook b3b62c3b9e Fixed obvious typo, paired with rdw. 2007-10-08 22:40:47 +00:00
Ryan Williams 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
Aaron Brashears 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
Ryan Williams 9fc7049151 This should hide the problem in SL-56900. Reviewed by Donovan. 2007-10-03 23:20:12 +00:00
Aaron Brashears 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
Christian Goetze 910c792b00 svn merge -r70295:70503 svn+ssh://svn/svn/linden/branches/pylibs-freshen3 2007-09-26 14:41:36 +00:00
Aaron Brashears 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
Aaron Brashears 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
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
Aaron Brashears 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
Ryan Williams 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
Don Kjer 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
Seth Alves 4284da1787 fix up copyrights on asset gc files 2007-07-25 22:44:05 +00:00
Seth Alves 87955ce1eb asset garbage collection scripts 2007-07-25 17:35:44 +00:00
Bryan O'Sullivan 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
Aaron Brashears 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
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
Josh Bell 98740db8fd svn merge -r 59826:59968 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-04-04 19:49:24 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00