summaryrefslogtreecommitdiff
path: root/indra/llmessage
AgeCommit message (Expand)Author
2009-09-01Merged login-api with viewer-2.0.0-3 up through r132290.brad kittenbrink
2009-09-01DEV-34522: [COMMENTS ONLY] clean up comments about (formerly) disabled testsNat Goodspeed
2009-08-31Merge with trunkBryan O'Sullivan
2009-08-28DEV-38596: Introduce Mani's LL_ADD_INTEGRATION_TEST macro.Nat Goodspeed
2009-08-27Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 m...brad kittenbrink
2009-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
2009-07-30Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so ...brad kittenbrink
2009-07-29svn merge -r128774:128808 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1737Christian Goetze
2009-07-24For QAR-1710 : Server merge for QAR-1594 QAR-1643 QAR-1644 - "AVP Changes [SIM]"Loren Shih
2009-07-23svn merge -r 127683:128178 svn+ssh://svn.lindenlab.com/svn/linden/branches/av...Loren Shih
2009-07-16Make googlemock publicly availableChristian Goetze
2009-07-16Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.Mark Palange
2009-07-15svn merge -r126867:127217 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1691Christian Goetze
2009-07-14QAR-1651Dave Hiller
2009-07-10Expanded tabs in cmake filespalmer@945battery-guestB-224.lindenlab.com
2009-07-09DEV-34822Roxanne Skelly
2009-07-08DEV-34822 - merge with 1.23Roxanne Skelly
2010-02-01Merge giab-viewer-trunk 2497, general merge of moreRoxie Linden
2009-07-01svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654Christian Goetze
2009-06-29Merge with viewer-2.0.0-3Bryan O'Sullivan
2009-06-24merge -r125267:125272 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-...Loren Shih
2009-06-23Removed conflict markers (ie. <<<<<<<) in llmessage/CMakeLists.txtMark Palange (Mani)
2009-06-23Resolve mergeNat Goodspeed
2009-06-23Incomplete attempt to clean up Mercurial branch buildNat Goodspeed
2009-06-23Fixed an "ADD_BUILD_TEST" leftover from the initial merge.palange@becane.lindenlab.com
2009-06-22Merge with viewer-2.0.0-3 branchBryan O'Sullivan
2009-06-22QAR-1383: convert new uses of Boost.Signals (arriving from other branches) toNat Goodspeed
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-06-19result of "svn merge -r123757:124890 svn+ssh://svn.lindenlab.com/svn/linden/b...Paul Oppenheim
2009-06-19DEV-31980: extract dispatch-by-string-name logic from LLAresListener to newNat Goodspeed
2009-06-04Fix licensing, also make the unzipping quieter, so that license error message...Christian Goetze
2009-06-04Merge of QAR-1383 event-system-7 into trunk.Brad Kittenbrink
2009-05-27DEV-31979: Introduce LLReqID, a class to help individual event API listenersNat Goodspeed
2009-05-22DEV-27646 dll linkage for login module.Brad Kittenbrink
2009-05-19svn merge -r118673:120720 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Robert Knop
2009-05-18Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_da...Aaron Brashears
2009-05-11svn merge -r113003:119136 svn+ssh://svn.lindenlab.com/svn/linden/branches/log...Nat Goodspeed
2009-05-08svn merge -r114679:114681 svn+ssh://svn.lindenlab.com/svn/linden/branches/eve...Nat Goodspeed
2009-05-08merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7Steven Bennetts
2009-05-04QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3Adam Moss
2009-04-21svn merge -r117696:117697 svn+ssh://svn.lindenlab.com/svn/linden/branches/fix...Kelly Washington
2009-04-16svn merge -r117314:117337Adam Moss
2009-04-09svn merge -r115000:116937 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Robert Knop
2009-03-20svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Dave Simmons
2009-03-09svn merge -r113780:113785Adam Moss
2009-03-05revert revision 113792. wrong branchAaron Brashears
2009-03-05bail if data_size is zero. crashes windows application since it throws an exc...Aaron Brashears
2009-03-02Clean up use of tutBryan O'Sullivan
2009-03-02Fix licenses of exported files, reviewed by daveHChristian Goetze
2009-02-25svn merge -r108815:112761 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Robert Knop