summaryrefslogtreecommitdiff
path: root/indra/test
AgeCommit message (Collapse)Author
2007-12-21svn merge -r74200:76302 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome.
2007-12-05Result of svn merge -r74235:74242 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/robust-pump into release
2007-12-01 svn merge -r74808:74832 svn+ssh://svn/svn/linden/branches/qa-dpo-9aChristian Goetze
2007-10-04Result of svn merge -r71162:71205 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04Result of svn merge -r70873:71086 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
2007-10-02export source now detects the prefix rather than assigning it based on ↵Aaron Brashears
filename. fixed up some comments to match our coding standard. added ability to set default license on export which will be useful for the next source drop. SL-56607
2007-09-14EFFECTIVE MERGE: svn merge -r 68118:68999 ↵Don Kjer
svn+ssh://svn/svn/linden/branches/maintenance ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999
2007-08-10merge -r 66233:67472 svn+ssh://svn/svn/linden/branches/het-grid-4 Paired by ↵Tess Chu
Tess and Leyla. Added tests to version manager and fixed failed tests. Paired by rdw and Tess.
2007-07-20Fixed cache invalidation in simulator.cpp, llsd.php, added RFC 1123 ↵Kartic Krishnamurthy
compliant date format, and unit test for the new date function
2007-07-20Result of svn merge -r65354:66054 svn+ssh://svn/svn/linden/branches/ezrpc ↵Aaron Brashears
into release
2007-07-18svn merge -r64837:65485 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release (only inside indra) (josh) Original log message was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance bos updated it to be: svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance However, it appears it actually was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance ... missing some file additions.
2007-07-18svn merge -r63705:65463 svn+ssh://svn/svn/linden/branches/dpo-3-bug-fixKartic Krishnamurthy
NOTE: r63705 is *not* the earliest rev# for dpo-3-bug-fix.
2007-07-16Result of svn merge -r65183:65337 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/python-shuffle into release. Also includes untabification of many python files.
2007-07-16Result of svn merge -r65183:65337 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/python-shuffle into release.
2007-07-12svn merge -r65092:65220 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance-r64837
2007-07-11svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 ↵Tess Chu
svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
2007-07-09Documented what we're testing and why.James Cook
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-05-07svn merge -r 61367:61368 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release -- porting test spam removal
2007-05-04svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-05-03Result of svn merge -r59717:60410 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/adroit.2007-03-13 into release.
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-05-01svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate ↵Don Kjer
into release
2007-04-05Result of svn merge -r59958:60105 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/discard-garbage into release
2007-03-20svn merge -r59459:59476 ↵Karen Clark
svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release.
2007-03-05merge r58577:58578 Branch_1-13-3 to releaseKelly Washington
2007-02-21SL-33966: Viewer installed files are not described in a centralized sourceRyan Williams
This introduces the viewer_manifest.py and associated libraries. Check out https://osiris.lindenlab.com/mediawiki/index.php/Installer_Manifest for some more information. The gist of it is that all files to be included in the viewer installations are described in viewer_manifest.py. viewer_manifest.py also acts as a packager, if you give it the right options. All of the old methods of packaging (Makefile_Mac, scons, and the various .bat files) still work, but they are mostly just shells for calls to viewer_manifest.py. You're now required to have python 2.3 or later on your machine to be able to package up an installer, but thankfully most people already have this.
2007-02-15merge -r 57761:57967 im-email-session-3, removes database load from IM to ↵James Cook
email session tracking, introduces new format for email return addresses
2007-02-09Result of svn merge -r57350:57790 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/os-patches.001 into release.
2007-02-07Fixed a linux build issue when the llhavok suddenly required rtti in order ↵Andrew Meadows
to link. I added a #ifndef hack to v3math.h to eliminate LLString's from the llhavok project. I also removed lluuid.h's dependency on LLString (using std::string) instead and then fixed a bunch of bad dependency fallout on a few files around the project that suddenly lost their hidden access to some fundamental includes. The important parts were reviewed with James.
2007-02-06merge in of error-refactor-3Mark Lentczner
concludes (fixes) SL-31187 pair programmed and reviewed by markl and karen
2007-02-02Result of svn merge -r57264:57370 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-01-02Print done when done.James Cook
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 00:35:04 +0000