summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Collapse)Author
2007-08-02Merge down from Branch_1-18-1:Monroe Williams
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
2007-08-01Result of svn merge -r66742:66741 svn+ssh://svn/svn/linden/release in ↵Aaron Brashears
release to revert revision 66742 which was a merge from mp-backbone.
2007-07-30Result of svn merge -r66103:66418 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/mp-backbone into release
2007-07-26merge -r66262:66263 linden/branches/kelly/llgetobjectdetails-2Kelly Washington
2007-07-26EFFECTIVE MERGE: svn merge -r 65485:66133 ↵Don Kjer
svn+ssh://svn/svn/linden/branches/maintenance into release This includes fixes to the maintenance-r66133 branch, and sync'ing up with release@r66392 ACTUAL MERGE: svn merge -r 66394:66435 svn+ssh://svn/svn/linden/branches/release-r66392 into release EQUIVALENT TO: svn merge -r 65485:66434 svn+ssh://svn/svn/linden/branches/maintenance-r66133 into release (plus branch sync'ing)
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-20svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release * WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269
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-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-02svn merge -r 62595:62596 and 62598:63308 sse-skinning-3 for faster software ↵James Cook
avatar rendering. Visual Studio 2005 project file fixed pending.
2007-07-02svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-06-13result of merge manually performed through diff and patch. svn diff ↵Aaron Brashears
svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release
2007-06-12svn merge -r 62560:62559 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance Revert bad patch for VWR-849 / SL-43759
2007-06-09svn merge -r 63284:63298 ↵Don Kjer
svn+ssh://svn/svn/linden/branches/content-loss-metrics-4 into release
2007-06-04svn merge -r 62602:62831 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-05-30merge -r61423:62602 svn/branches/maintenance --> releaseKelly Washington
2007-05-23svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 ↵Brad Kittenbrink
svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> 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 61099:61168 svn+ssh://svn/svn/linden/branches/release-candidate ↵Don Kjer
into release
2007-05-01svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate ↵Don Kjer
into release
2007-04-11svn merge -r 59968:60342 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-04-06SL-39721 Run a mini-grid without editing any configuration files. Added ↵James Cook
start-servers.py and start-client.py. Renamed output executable names to "spaceserver" instead of "newspace", etc. Repaired batch files to use new executable names. Added svn ignores for new executables and intermediate files. Removed llcommon, other linden libraries from explicit linker Additional Dependencies section because this makes IncrediBuild link the libraries twice, slowing it down. Reviewed by Don.
2007-04-02Fixed build for convertj2c.Steven Bennetts
2007-03-31svn merge -r 59364:59813 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-27Ported MarkL's fix for SL-38277 to release from message-liberation-5. svn ↵Karen Clark
merge -r59784:59785 svn+ssh://svn.lindenlab.com/svn/linden/branches/message-liberation-5 into svn+ssh://svn.lindenlab.com/svn/linden/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-16merge -r 59028:59178 maintenance -> release.Steven Bennetts
2007-03-16merge -r58842:59035 branches/loadstone-names to releaseKelly Washington
2007-03-15svn merge -r 58433:58660 svn+ssh://svn/svn/linden/branches/upload-queue into ↵Don Kjer
release
2007-03-14svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate@59163 --> release
2007-03-09svn merge -r 58902:58986 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-07merge release@58791 vc8@58828 -> releaseSteven Bennetts
Adds Dev Studio 2005 (VC8) Reviewed by Rob
2007-03-07SKIPPED 58849. merge -r 58856:58859 maintenance -> releaseSteven Bennetts
2007-03-06merge -r 58641:58711 maintenance -> releaseSteven Bennetts
2007-03-05merge -r58599:58732 branches/im-email-base32 to releaseKelly Washington
2007-03-05merge -r57991:58444 branches/distribute/user/mute to releaseKelly Washington
2007-03-05merge r58577:58578 Branch_1-13-3 to releaseKelly Washington
2007-03-02merge release@58699 beta-1-14-0@58707 -> releaseSteven Bennetts
2007-03-02merge -r 58503:58641 maintenance -> releaseSteven Bennetts
2007-02-27svn merge -r58163:58241 loadstone-sim-standby, reduces database load from ↵James Cook
standby sims polling the database for a region to run
2007-02-20svn merge -r 57620:58007 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-02-17merge -r 56779:58057 /branches/selection_managementRichard Nelson
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-13svn merge -r 57708:57906 ↵Don Kjer
svn+ssh://svn/svn/linden/branches/don/inventory-dataserver-2
2007-02-12Landing embedded Mozilla support for the Linux Client.Adam Moss
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@57782 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxmozilla-r57782base
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.
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-30 15:55:10 +0000