phoenix-firestorm/indra/llmessage
Kartic Krishnamurthy 52cb2aea86 svn merge -r67131:67483 svn+ssh://svn/svn/linden/branches/Branch_1-18-1 2007-08-08 00:55:57 +00:00
..
llassetstorage.cpp Tweak initializer order to silence a gcc warning (now treated as error) 2007-06-22 20:56:24 +00:00
llassetstorage.h svn merge -r 63401:63939 svn+ssh://svn.lindenlab.com/svn/linden/branches/derez-asset-loss-1 --> release 2007-06-22 18:23:39 +00:00
llblowfishcipher.cpp merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
llblowfishcipher.h merge -r 57761:57967 im-email-session-3, removes database load from IM to email session tracking, introduces new format for email return addresses 2007-02-15 20:24:08 +00:00
llbuffer.cpp Result of svn merge -r59958:60105 svn+ssh://svn/svn/linden/branches/discard-garbage into release 2007-04-05 20:11:55 +00:00
llbuffer.h result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release 2007-06-13 18:02:37 +00:00
llbufferstream.cpp Result of svn merge -r59958:60105 svn+ssh://svn/svn/linden/branches/discard-garbage into release 2007-04-05 20:11:55 +00:00
llbufferstream.h Print done when done. 2007-01-02 08:33:20 +00:00
llcachename.cpp merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
llcachename.h result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release 2007-06-13 18:02:37 +00:00
llchainio.cpp Print done when done. 2007-01-02 08:33:20 +00:00
llchainio.h Print done when done. 2007-01-02 08:33:20 +00:00
llcipher.h merge -r 57761:57967 im-email-session-3, removes database load from IM to email session tracking, introduces new format for email return addresses 2007-02-15 20:24:08 +00:00
llcircuit.cpp svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-02 21:24:47 +00:00
llcircuit.h 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
llclassifiedflags.cpp Print done when done. 2007-01-02 08:33:20 +00:00
llclassifiedflags.h svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-04-11 17:54:18 +00:00
llcurl.cpp svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-07-18 21:22:40 +00:00
llcurl.h merge -r61423:62602 svn/branches/maintenance --> release 2007-05-30 17:39:09 +00:00
lldatapacker.cpp svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-07-20 20:38:05 +00:00
lldatapacker.h merge -r 56738:56842 maintenance. 2007-01-18 00:36:25 +00:00
lldbstrings.h Print done when done. 2007-01-02 08:33:20 +00:00
lldispatcher.cpp SL-36804 Fixed offline IMs by changing source host dataserver checks to check against all dataservers. 2007-03-07 20:11:50 +00:00
lldispatcher.h Print done when done. 2007-01-02 08:33:20 +00:00
lleventflags.h Print done when done. 2007-01-02 08:33:20 +00:00
llfiltersd2xmlrpc.cpp merge -r 57761:57967 im-email-session-3, removes database load from IM to email session tracking, introduces new format for email return addresses 2007-02-15 20:24:08 +00:00
llfiltersd2xmlrpc.h Print done when done. 2007-01-02 08:33:20 +00:00
llfollowcamparams.h Print done when done. 2007-01-02 08:33:20 +00:00
llhost.cpp 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
llhost.h 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
llhttpassetstorage.cpp svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-07-18 21:22:40 +00:00
llhttpassetstorage.h svn merge -r 63401:63939 svn+ssh://svn.lindenlab.com/svn/linden/branches/derez-asset-loss-1 --> release 2007-06-22 18:23:39 +00:00
llhttpclient.cpp svn merge -r67131:67483 svn+ssh://svn/svn/linden/branches/Branch_1-18-1 2007-08-08 00:55:57 +00:00
llhttpclient.h svn merge -r63705:65463 svn+ssh://svn/svn/linden/branches/dpo-3-bug-fix 2007-07-18 01:28:59 +00:00
llhttpnode.cpp merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
llhttpnode.h svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-06-04 18:46:59 +00:00
llhttpsender.cpp 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
llhttpsender.h 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
llinstantmessage.cpp result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release 2007-06-13 18:02:37 +00:00
llinstantmessage.h result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release 2007-06-13 18:02:37 +00:00
llinvite.h Print done when done. 2007-01-02 08:33:20 +00:00
lliobuffer.cpp Print done when done. 2007-01-02 08:33:20 +00:00
lliobuffer.h Print done when done. 2007-01-02 08:33:20 +00:00
lliohttpserver.cpp svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-07-20 20:38:05 +00:00
lliohttpserver.h svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-02 21:24:47 +00:00
lliopipe.cpp Print done when done. 2007-01-02 08:33:20 +00:00
lliopipe.h svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release 2007-05-01 21:39:25 +00:00
lliosocket.cpp 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
lliosocket.h Print done when done. 2007-01-02 08:33:20 +00:00
llioutil.cpp Print done when done. 2007-01-02 08:33:20 +00:00
llioutil.h Print done when done. 2007-01-02 08:33:20 +00:00
llloginflags.h Print done when done. 2007-01-02 08:33:20 +00:00
llmail.cpp svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-02 21:24:47 +00:00
llmail.h merge -r 57761:57967 im-email-session-3, removes database load from IM to email session tracking, introduces new format for email return addresses 2007-02-15 20:24:08 +00:00
llmessagebuilder.cpp svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release 2007-05-01 21:39:25 +00:00
llmessagebuilder.h 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
llmessageconfig.cpp svn merge -r63705:65463 svn+ssh://svn/svn/linden/branches/dpo-3-bug-fix 2007-07-18 01:28:59 +00:00
llmessageconfig.h svn merge -r63705:65463 svn+ssh://svn/svn/linden/branches/dpo-3-bug-fix 2007-07-18 01:28:59 +00:00
llmessagereader.cpp svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-07-20 20:38:05 +00:00
llmessagereader.h 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
llmessagetemplate.cpp 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
llmessagetemplate.h 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
llmessagetemplateparser.cpp svn merge -r65092:65220 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance-r64837 2007-07-12 22:18:34 +00:00
llmessagetemplateparser.h 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
llmessagethrottle.cpp merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
llmessagethrottle.h Print done when done. 2007-01-02 08:33:20 +00:00
llmime.cpp Print done when done. 2007-01-02 08:33:20 +00:00
llmime.h Print done when done. 2007-01-02 08:33:20 +00:00
llmsgvariabletype.h 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
llnamevalue.cpp svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-07-18 21:22:40 +00:00
llnamevalue.h svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-07-20 20:38:05 +00:00
llnullcipher.cpp merge -r 57761:57967 im-email-session-3, removes database load from IM to email session tracking, introduces new format for email return addresses 2007-02-15 20:24:08 +00:00
llnullcipher.h merge -r 57761:57967 im-email-session-3, removes database load from IM to email session tracking, introduces new format for email return addresses 2007-02-15 20:24:08 +00:00
llpacketack.cpp 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
llpacketack.h 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
llpacketbuffer.cpp svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-02 21:24:47 +00:00
llpacketbuffer.h Print done when done. 2007-01-02 08:33:20 +00:00
llpacketring.cpp Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release. 2007-02-02 17:28:58 +00:00
llpacketring.h Print done when done. 2007-01-02 08:33:20 +00:00
llpartdata.cpp merge release@58699 beta-1-14-0@58707 -> release 2007-03-02 21:25:50 +00:00
llpartdata.h merge release@58699 beta-1-14-0@58707 -> release 2007-03-02 21:25:50 +00:00
llpumpio.cpp svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release 2007-05-01 21:39:25 +00:00
llpumpio.h svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release 2007-05-01 21:39:25 +00:00
llqueryflags.h svn merge -r59580:59621 svn+ssh://svn/svn/linden/branches/adult-content-flag svn+ssh://svn/svn/linden/release 2007-04-05 18:58:18 +00:00
llregionflags.h result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release 2007-06-13 18:02:37 +00:00
llregionhandle.h Print done when done. 2007-01-02 08:33:20 +00:00
llsdappservices.cpp merge -r 58986:59028 maintenance 2007-03-09 22:55:16 +00:00
llsdappservices.h Print done when done. 2007-01-02 08:33:20 +00:00
llsdhttpserver.cpp Print done when done. 2007-01-02 08:33:20 +00:00
llsdhttpserver.h Print done when done. 2007-01-02 08:33:20 +00:00
llsdmessagebuilder.cpp 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
llsdmessagebuilder.h 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
llsdmessagereader.cpp 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
llsdmessagereader.h 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
llsdrpcclient.cpp Print done when done. 2007-01-02 08:33:20 +00:00
llsdrpcclient.h Print done when done. 2007-01-02 08:33:20 +00:00
llsdrpcserver.cpp Print done when done. 2007-01-02 08:33:20 +00:00
llsdrpcserver.h Print done when done. 2007-01-02 08:33:20 +00:00
llservice.cpp Print done when done. 2007-01-02 08:33:20 +00:00
llservice.h svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release 2007-05-01 21:39:25 +00:00
llservicebuilder.cpp svn merge -r63705:65463 svn+ssh://svn/svn/linden/branches/dpo-3-bug-fix 2007-07-18 01:28:59 +00:00
llservicebuilder.h svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release 2007-05-01 21:39:25 +00:00
lltaskname.h Print done when done. 2007-01-02 08:33:20 +00:00
llteleportflags.h svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-07-02 17:10:30 +00:00
lltemplatemessagebuilder.cpp 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
lltemplatemessagebuilder.h 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
lltemplatemessagereader.cpp svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-07-20 20:38:05 +00:00
lltemplatemessagereader.h 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
llthrottle.cpp corrected, removed, and updated comments throughout the code to be more useful. no code changes. SL-13762 2007-01-03 21:05:41 +00:00
llthrottle.h Print done when done. 2007-01-02 08:33:20 +00:00
lltransfermanager.cpp 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
lltransfermanager.h 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
lltransfersourceasset.cpp merge release@56803 release-candidate@56833 2007-01-17 23:02:00 +00:00
lltransfersourceasset.h merge release@56803 release-candidate@56833 2007-01-17 23:02:00 +00:00
lltransfersourcefile.cpp merge -r 56738:56842 maintenance. 2007-01-18 00:36:25 +00:00
lltransfersourcefile.h merge release@56803 release-candidate@56833 2007-01-17 23:02:00 +00:00
lltransfertargetfile.cpp merge release@56803 release-candidate@56833 2007-01-17 23:02:00 +00:00
lltransfertargetfile.h merge release@56803 release-candidate@56833 2007-01-17 23:02:00 +00:00
lltransfertargetvfile.cpp merge release@58699 beta-1-14-0@58707 -> release 2007-03-02 21:25:50 +00:00
lltransfertargetvfile.h merge release@58699 beta-1-14-0@58707 -> release 2007-03-02 21:25:50 +00:00
llurlrequest.cpp svn merge -r67131:67483 svn+ssh://svn/svn/linden/branches/Branch_1-18-1 2007-08-08 00:55:57 +00:00
llurlrequest.h svn merge -r67131:67483 svn+ssh://svn/svn/linden/branches/Branch_1-18-1 2007-08-08 00:55:57 +00:00
lluseroperation.cpp svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-07-18 21:22:40 +00:00
lluseroperation.h svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-07-18 21:22:40 +00:00
llvehicleparams.h Print done when done. 2007-01-02 08:33:20 +00:00
llxfer.cpp Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release. 2007-02-02 17:28:58 +00:00
llxfer.h Print done when done. 2007-01-02 08:33:20 +00:00
llxfer_file.cpp svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-07-20 20:38:05 +00:00
llxfer_file.h Print done when done. 2007-01-02 08:33:20 +00:00
llxfer_mem.cpp svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-02 21:24:47 +00:00
llxfer_mem.h Print done when done. 2007-01-02 08:33:20 +00:00
llxfer_vfile.cpp Print done when done. 2007-01-02 08:33:20 +00:00
llxfer_vfile.h Print done when done. 2007-01-02 08:33:20 +00:00
llxfermanager.cpp svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-02 21:24:47 +00:00
llxfermanager.h Print done when done. 2007-01-02 08:33:20 +00:00
llxorcipher.cpp merge -r 57761:57967 im-email-session-3, removes database load from IM to email session tracking, introduces new format for email return addresses 2007-02-15 20:24:08 +00:00
llxorcipher.h merge -r 57761:57967 im-email-session-3, removes database load from IM to email session tracking, introduces new format for email return addresses 2007-02-15 20:24:08 +00:00
machine.h svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-07-02 17:10:30 +00:00
mean_collision_data.h Print done when done. 2007-01-02 08:33:20 +00:00
message.cpp svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-07-20 20:38:05 +00:00
message.h svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-07-20 20:38:05 +00:00
message_prehash.cpp 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
message_prehash.h 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
message_string_table.cpp Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release. 2007-02-02 17:28:58 +00:00
net.cpp svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-07-02 17:10:30 +00:00
net.h merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
partsyspacket.cpp Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release. 2007-02-02 17:28:58 +00:00
partsyspacket.h Print done when done. 2007-01-02 08:33:20 +00:00
patch_code.cpp Print done when done. 2007-01-02 08:33:20 +00:00
patch_code.h Print done when done. 2007-01-02 08:33:20 +00:00
patch_dct.cpp Print done when done. 2007-01-02 08:33:20 +00:00
patch_dct.h Print done when done. 2007-01-02 08:33:20 +00:00
patch_idct.cpp Print done when done. 2007-01-02 08:33:20 +00:00
sound_ids.h Print done when done. 2007-01-02 08:33:20 +00:00