summaryrefslogtreecommitdiff
path: root/indra/llmessage
AgeCommit message (Expand)Author
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
2009-02-24merge -r 112783:112799 linden/branches/kelly/lsl-http-in-merge to linden/trunkKelly Washington
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render...Brad Kittenbrink
2009-02-06svn merge -r 108748:109731 svn+ssh://svn.lindenlab.com/svn/linden/branches/se...Robert Knop
2009-02-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
2009-01-22Merging from production branch to trunkRobert Knop
2009-01-19svn merge -r108243:108266 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Robert Knop
2009-01-19svn merge -r108236:108243 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Robert Knop
2009-01-19Merging from the server/server-1.25 branchRobert Knop
2009-01-17svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-ser...Andrew Meadows
2009-01-08svn merge -r104838:107352 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Robert Knop
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-12-15svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featu...Melinda Green
2008-12-04Merging from server/server-1.25 back to trunk.Robert Knop
2008-12-02QAR-1040 maint-viewer-11 + OpenAL combo mergemeAdam Moss
2008-12-01svn merge -r103586:104391 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-ser...Andrew Meadows
2008-11-21Merging the changes in viewer_1-22-0 (1.22 RC0) back into trunk, revs. 101837...Mark Palange
2008-11-18QAR-963 svn merge -r101685:101752 svn+ssh://svn.lindenlab.com/svn/linden/bran...Christian Goetze
2008-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.linden...Mark Palange
2008-10-17DEV-22360 - Interim fix for VWR-9784: Unable to upload scripts - this will be...Brian McGroarty
2008-10-09QAR-907: svn merge -r 98908:98910 svn+ssh://svn/svn/linden/qa/sim-metrics/sim...Don Kjer
2008-10-08merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes...Mark Palange
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 01:11:45 +0000