summaryrefslogtreecommitdiff
path: root/indra/llmessage/llmail.cpp
AgeCommit message (Collapse)Author
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-10-01svn merge -r96886:98039 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
dataserver-is-deprecated
2008-06-02svn merge -r88066:88786 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers
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-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-03-05merge -r58599:58732 branches/im-email-base32 to releaseKelly Washington
2007-02-23Ported dataserver connectInventory() inventory host name hint code from ↵James Cook
loadstone-inventory-host-3 which should dramatically reduces read queries against the user table for IM processing. Reviewed by Tess.
2007-02-15merge -r 57761:57967 im-email-session-3, removes database load from IM to ↵James Cook
email session tracking, introduces new format for email return addresses
2007-01-04svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431 This turned up the following "lost" changes: llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly llfontgl.cpp (from maintenance r50207) - whitespace only inventorybridge.cpp (property - non-executable) skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL
2007-01-02Print done when done.James Cook