summaryrefslogtreecommitdiff
path: root/indra/llmessage/llassetstorage.cpp
AgeCommit message (Collapse)Author
2008-02-13svn merge -r 79828:79862 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-2008-02-12 --> release QAR-280 - combo merge of: * QAR-249 Allow specifying max http protocol version in eventlet.httpd, and change backbone.py to specify HTTP/1.0 explicitly * QAR-272 Switch logout/disconnect messages to syslog/streambase * QAR-253 Test for the group names fix * QAR-260 metrics-3 for release merge
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-04Result of svn merge -r70873:71086 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
2007-08-21EFFECTIVE MERGE: svn merge -r 66133:68118 ↵Christian Goetze
svn+ssh://svn/svn/linden/branches/maintenance into release Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-06-22Tweak initializer order to silence a gcc warning (now treated as error)Josh Bell
2007-06-22svn merge -r 63401:63939 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/derez-asset-loss-1 --> release NOTE: Skipped whitespace-only changes
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-03-30Merge of final upload-queue changes from Branch_1-13-4 --> releaseJosh Bell
svn merge -r 59496:59497 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-4 --> release svn merge -r 59530:59531 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-4 --> release svn merge -r 59827:59828 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-4 --> release svn merge -r 59315:59316 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release In order, that's: * back out upload-queue * apply a subset * apply the full thing * re-merge the addition of the DELETE REST Most of which turns into a no-op. Reviewed by don.
2007-03-20svn merge -r59459:59476 ↵Karen Clark
svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release.
2007-03-15svn merge -r 58433:58660 svn+ssh://svn/svn/linden/branches/upload-queue into ↵Don Kjer
release
2007-02-02Result of svn merge -r57264:57370 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-01-17merge release@56803 release-candidate@56833Steven Bennetts
2007-01-02Print done when done.James Cook
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 09:14:50 +0000