summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2008-02-19merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r ...Steven Bennetts
2008-02-16svn merge -r 80024:80160 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-02-15svn merge -r 79841:79886 svn+ssh://svn.lindenlab.com/svn/linden/branches/self...Josh Bell
2008-02-14svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parc...Josh Bell
2008-02-13merge elar-merge-3 -r 79884 : 79923 -> releaseSteven Bennetts
2008-02-13svn merge -r 79455:79892 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-02-13svn merge -r 79828:79862 svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merg...Josh Bell
2008-02-12Committing changes to add -loginuri for dev grids.Anthony Foster
2008-02-12svn merge -r 79680:79822 svn+ssh://svn.lindenlab.com/svn/linden/branches/merg...Josh Bell
2008-02-08Result of svn merge -r79554:79558 svn+ssh://svn/svn/linden/branches/merge-dp ...Aaron Brashears
2008-02-07svn merge -r 79445:79449 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenanc...Josh Bell
2008-02-05do not attempt to use secondlife.com in unit tests for now.Aaron Brashears
2008-02-05svn merge -r 78407:79136 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-02-01merge Branch_1-19-0-Viewer -r 78432:78989 -> releaseSteven Bennetts
2008-02-01EFFECTIVE MERGE: maint-viewer-3 -r 77368:77381 -> releaseSteven Bennetts
2008-01-28svn merge -r 78408:78432 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-01-24svn merge -r 78173:78397 search-milestone2-1 for classified click-through log...James Cook
2008-01-24svn merge -r 77416:78126 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Jon Wolk
2008-01-24svn merge -r 77415:77842 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Jon Wolk
2008-01-24DEV-9328 DEV-9330 DEV-9334 Fixed license information in source files to match...James Cook
2008-01-23DEV-8923: info window does not pop up when transitioning from a Havok1 to Hav...Leyla Farazha
2008-01-19dev-8998 xuilogin shows grid dropdown by defaultLeyla Farazha
2008-01-18svn merge -r77476:77484 svn+ssh://svn.lindenlab.com/svn/linden/branches/sculp...Josh Bell
2008-01-18svn merge -r 77823:77835 svn+ssh://svn.lindenlab.com/svn/linden/branches/logi...Josh Bell
2008-01-17QAR-211: Logical merge of:Josh Bell
2008-01-12svn merge -r76807:77355 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Josh Bell
2008-01-07svn merge -r 76923:76933 svn+ssh://svn.lindenlab.com/svn/linden/branches/impr...Josh Bell
2008-01-03svn merge -r76651:76807 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Josh Bell
2008-01-03svn merge -r76207:76805 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Josh Bell
2007-12-29D'oh, try compiling before committing. (If it's any justification, CG was com...Josh Bell
2007-12-29svn merge -r 76642:76643 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenanc...Josh Bell
2007-12-28svn merge -r 76394:76651 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...James Cook
2007-12-21svn merge -r76302:76346 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Josh Bell
2007-12-21svn merge -r74200:76302 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Josh Bell
2007-12-20svn merge -r74912:76207 svn+ssh://svn/svn/linden/branches/Branch_1-18-6-Serv...Christian Goetze
2007-12-19svn merge -r75015:75150 svn+ssh://svn/svn/linden/branches/security-lsl-setnam...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-12-13Fix compilation errorJon Wolk
2007-12-07EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 -> maint-viewer-2-m...Steven Bennetts
2007-12-06Switching from XML streaming to Notation streaming for new streambase logging...Don Kjer
2007-12-06EFFECTIVE MERGE: svn -r 74436:74675 svn+ssh://svn/svn/linden/branches/log-str...Don Kjer
2007-12-06svn merge -r 75234:75235 svn+ssh://svn/svn/linden/branches/maintenance-5 into...Don Kjer
2007-12-06EFFECTIVE MERGE: svn merge -r 73781:75018 svn+ssh://svn/svn/linden/branches/F...Don Kjer
2007-12-05EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/...Don Kjer
2007-12-05removed use of typeid()Aaron Brashears
2007-12-05Result of svn merge -r74235:74242 svn+ssh://svn/svn/linden/branches/robust-pu...Aaron Brashears
2007-12-04EFFECTIVE MERGE: maint-ui-qa3 -r 73391:74133 -> releaseSteven Bennetts
2007-12-03svn merge -r 74415:74849 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-12-03-74901 (back out premature commit to release)Steven Bennetts