summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Expand)Author
2009-09-01Merge with SVN viewer-2.0.0-3 branchBryan O'Sullivan
2009-09-01DEV-34522: [COMMENTS ONLY] clean up comments about (formerly) disabled testsNat Goodspeed
2009-08-31Port over the new build scripts from para-test, tweek update_version_files to...CG Linden
2009-08-29Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> viewer-2...Steven Bennetts
2009-08-28DEV-38596: Introduce Mani's LL_ADD_INTEGRATION_TEST macro.Nat Goodspeed
2009-08-27svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/mo...Monroe Williams
2009-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
2009-08-19EXT-591 Create an Object (Build tool) will crash viewerSteven Bennetts
2009-08-18svn merge -r130469:130817 svn+ssh://svn.lindenlab.com/svn/linden/branches/ava...Loren Shih
2009-08-17Significant optimization to LLUIString.Steven Bennetts
2009-08-12svn merge -r129617:130277 svn+ssh://svn.lindenlab.com/svn/linden/branches/ava...Loren Shih
2009-08-04svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/sk...Richard Nelson
2009-07-23svn merge -r 127683:128178 svn+ssh://svn.lindenlab.com/svn/linden/branches/av...Loren Shih
2009-07-16Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.Mark Palange
2009-07-08merge -r 889-936 https://svn.aws.productengine.com/secondlife/pe/stable/ -> v...Steven Bennetts
2009-06-24merge -r125267:125272 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-...Loren Shih
2009-06-22trivial comment fixes for typos that were bugging me...Adam Moss
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-04Merge of QAR-1383 event-system-7 into trunk.Brad Kittenbrink
2009-05-22svn merge -r121194:121210Adam Moss
2009-05-19Now that 1.27 has branched away, bumping the version number to 1.29 toRobert Knop
2009-05-18Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_da...Aaron Brashears
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-04-01QAR-1284 ip-takedown tools simulator work is ready for mergeAndrew Meadows
2009-03-24Changed LL_VERSION_MINOR to equal 24Debi King
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-05Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).Eric Tulla
2009-02-25svn merge -r108815:112761 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Robert Knop
2009-02-24Fix another build bogonBryan O'Sullivan
2009-02-24Build fixBryan O'Sullivan
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-26Now that server 1.26 has frozen and branched away, bump the serverRobert 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-08setting viewer to report 1.23.0, because code in trunk is well beyond 1.22 no...Ramzi Ramey
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2009-01-06Fix for etch build. Q and I both fixed LLDate by adding an operator!=() but ...Andrew Meadows
2009-01-05svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/not...Kent Quirk
2008-12-23QAR-1142 merging 1.22 RC0-RC4 changes.Mark Palange
2008-12-19Fixing tut related compile errors on etch:Andrew Meadows
2008-12-18QAR-1075 svn merge -r106114:106224 svn+ssh://svn.lindenlab.com/svn/linden/bra...Christian Goetze