summaryrefslogtreecommitdiff
path: root/indra/llinventory
AgeCommit message (Expand)Author
2009-07-30Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so ...brad kittenbrink
2009-07-24svn merge -r 127369:127511 svn+ssh://svn.lindenlab.com/svn/linden/branches/av...Loren Shih
2009-07-23svn merge -r 127683:128178 svn+ssh://svn.lindenlab.com/svn/linden/branches/av...Loren Shih
2009-07-07Merge skinning-14 to viewer-2, including refactoring many floaters to registe...James Cook
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
2008-06-02svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake...Bryan O'Sullivan
2008-05-19EFFECTIVE MERGES:Don Kjer
2008-05-08QAR-570 maint-render-4 mergeSteven Bennetts
2008-05-07Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://sv...Brian McGroarty
2008-05-07QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenl...Brian McGroarty
2008-04-031.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426Steven Bennetts
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
2008-03-19QAR-377 maintenance-6 merge:Brian McGroarty
2008-03-12svn merge -r 82016:82020 svn+ssh://svn.lindenlab.com/svn/linden/branches/sing...Josh Bell
2008-03-11merge Branch_1-19-1-Viewer -r 80930 : 81609 -> releaseSteven Bennetts
2008-03-07svn merge -r 80990:81720 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-02-28svn merge -r 80357:80990 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-02-16svn merge -r 80024:80160 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-02-14svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parc...Josh Bell
2007-12-19svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voic...Jon Wolk
2007-12-14svn merge -c 73823 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenanc...Josh Bell
2007-11-15merge of age verification changes from QAR-76 to release; changes were origin...Kent Quirk
2007-11-01svn merge -r 72356:72879 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-11-01svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-s...Josh Bell
2007-10-10svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3Christian Goetze
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-10-04Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-ex...Aaron Brashears
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 08:19:38 +0000