summaryrefslogtreecommitdiff
path: root/indra/llinventory
AgeCommit message (Expand)Author
2009-11-04Redo Bao's broken mergeBryan O'Sullivan
2009-10-19mergeSteve Bennetts
2009-10-16merge from latest svn/viewer-2-0 to hg/viewer-2-0Mark Palange (Mani)
2009-10-16DEV-41404 convert monolithic tut llinventoryparcel test to llinventory integr...Adam Moss
2009-10-14Merge a big bunch of fixes from maint-viewer. Hooray.Adam Moss
2009-10-12DEV-41176 convert legacy inventory.cpp tut test into an llinventory integrati...Adam Moss
2009-09-18Merged latest viewer/viewer-20 into login-api.brad kittenbrink
2009-09-08Merge from trunkBryan O'Sullivan
2009-09-08MergeBryan O'Sullivan
2009-09-07merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@...Steven Bennetts
2009-09-04svn merge -r 129999:132607 svn+ssh://svn/svn/linden/branches/server/server-1....Don Kjer
2009-08-31Fix up some post-merge breakage.Bryan O'Sullivan
2009-08-31Merge with trunkBryan O'Sullivan
2009-08-27Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 m...brad kittenbrink
2009-08-27svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/mo...Monroe Williams
2009-08-13Merged latest viewer-2.0.0-3 change up through svn r130333 into login-api.brad kittenbrink
2009-08-12svn merge -r129617:130277 svn+ssh://svn.lindenlab.com/svn/linden/branches/ava...Loren Shih
2009-08-05EXT-316 Enable the Viewer to generate calling cards for any agentSteven Bennetts
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-24svn merge -r 127369:127511 svn+ssh://svn.lindenlab.com/svn/linden/branches/av...Loren Shih
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-22Merge of Parcel API V1 to trunk for 1.30 release. Hallelujah!Monty Brandenberg
2009-07-07Merge skinning-14 to viewer-2, including refactoring many floaters to registe...James Cook
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-22Merge with viewer-2.0.0-3 branchBryan O'Sullivan
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-05-22DEV-27646 dll linkage for login module.Brad Kittenbrink
2009-05-18Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_da...Aaron Brashears
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-16svn merge -r117314:117337Adam Moss
2009-04-08svn merge -r116334:116916 svn+ssh://svn.lindenlab.com/svn/linden/branches/rad...Ryan Williams
2009-04-01QAR-1284 ip-takedown tools simulator work is ready for mergeAndrew Meadows
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-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
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-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2009-01-05svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/not...Kent Quirk
2008-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.linden...Mark Palange
2008-09-16QAR-751 : Merge Agent Inventory Services - Fetch Inventory and Fetch Inventor...Kartic Krishnamurthy
2008-08-21Master QAR-807 passed.Kartic Krishnamurthy
2008-07-15svn merge -r 90938:92097 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-...Jon Wolk
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-06-07svn merge -r 88991:89027 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 13:31:26 +0000