summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2007-06-17svn merge -r 63833:63894 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-17-0 --> release Pick up patches committed to 1.17: * Commented out metrics code that seems to be causing a crash. * Adding metrics to deployed code. added missing __hash__ function to lluuid.py, which fixes using uuid's as keys in maps * Reverting fix for SL-25905; probably cause of script-vieweing exploit on agni. * Removed deploy key checks from farm
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-11fix for crash because of recent changes in tool handleSelect() from Richard. ↵Aaron Brashears
SL-44935
2007-06-11NOTE: Partial merges of the maintenance branch up. The bulk of maintenance ↵Josh Bell
62831:63347 is awaiting final QA and merging, post 1.17.0 svn merge -r 63182:63183 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release svn merge -r 63341:63342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release svn merge -r 63420:63421 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release Rush in the following fixes: * SL-27250 "Stop All Animations" doesn't work when stuck in a pose after teleporting * SL-44718 VWR-1040: crash when opening several gestures quickly * SL-44326 recurring error message in agni nightly #1
2007-06-09svn merge -r 63284:63298 ↵Don Kjer
svn+ssh://svn/svn/linden/branches/content-loss-metrics-4 into release
2007-06-05Removing a bug that addressed a coverity defect. This change is done in ↵Anthony Foster
maintenance, r-c, and release. Maintenance r63092 Reviewed by Richard.
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-26land mozilla-https-fix branch, -> releaseAdam Moss
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-21Copyright info added to llcurlSteven Bennetts
2007-05-15Merge all of the patches made to Branch_1-15-1 back into release:Josh Bell
* Release notes for 1.15.1(3) * Updated contributors list * Revert apr libraries (NOTE: Also done in maintenance, this should be a no-op...) * Fix for SL-42640 Entering appearance mode triggers "items coming too fast" * Fix for SL-42257 Mute Resident button does not open the user picker svn merge -r 61568:61569 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release svn merge -r 61585:61586 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release svn merge -r 61601:61602 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release svn merge -r 61761:61762 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release svn merge -r 61777:61778 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release svn merge -r 61805:61806 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release svn merge -r 61824:61825 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release
2007-05-15Version 1.15.2.0 (serverside only).Lee Montgomery
2007-05-08svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-05-08Removing Logitech LCD code: svn merge -r 60616:60615 ↵Don Kjer
svn+ssh://svn/svn/linden/release into release
2007-05-07Version 1.15.1.0.Lee Montgomery
2007-05-07merge -r61253:61354 branches/friends_1-15 to release, minus some spam.Kelly 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-03Attempt to revert release r61312 checkin. Whitespace onlyArthur Abraham
2007-05-03Reverting check-in to release with no QA... svn merge ↵Don Kjer
svn+ssh://svn/svn/linden/release -r 61312:61311
2007-05-03Solves SL-23488Arthur Abraham
2007-05-03Syncing missing changes in maintenance to releaseDon Kjer
2007-05-03Syncing up missing changes from release-candidateDon Kjer
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-05-02svn merge -r 61255:61259 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate --> 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-24Font noticesRob Lanphier
2007-04-18svn merge -r 59608:60615 ↵Jake Simpson
svn+ssh://svn.lindenlab.com/svn/linden/branches/jakesbranch --> release Adding Logitech G15 keyboard and Z10 speaker support for those LCD windows.
2007-04-18Found a few more source/data files that were executable. Bits -> bitbucketJosh Bell
2007-04-18A handful of source files had the svn:executable property set. Not any more.Josh Bell
2007-04-18SL-24485, SL-40331, SL-23136, SL-40330, SL-25816, SL-40567,Adam Moss
SL-40568: land moss/linuxmisc-r60383: misc linuxclient & opensource fixes. svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@60383 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxmisc-r60383 -> release
2007-04-11svn merge -r 59968:60342 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-04-07Fixed Mac compiler warnings for deployment builds.James Cook
2007-04-07Fix Mac compiler warning for deployment builds.James Cook
2007-04-07Fixed Mac deployment compiler warning (uninitialized memory read, but in ↵James Cook
unused code). Reviewed with Steve long ago.
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-05fix for crash in debug mode when in renderGlyph()Richard Nelson
reviewed by davep
2007-04-05Result of svn merge -r59958:60105 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/discard-garbage into release
2007-04-05svn merge -r59580:59621 svn+ssh://svn/svn/linden/branches/adult-content-flag ↵Kyle Machulis
svn+ssh://svn/svn/linden/release
2007-04-05svn merge -r 58913:59058 ↵Don Kjer
svn+ssh://svn/svn/linden/branches/rez-content-loss-1 into release
2007-04-05svn merge -r 59234:60086 svn+ssh://svn/svn/linden/branches/live_lsl_help2 -> ↵Richard Nelson
release
2007-04-04SL-21064 Made it so you can now check physical, temporary, and phantom for ↵Dave Kaprielian
multiple-selected objects. Reviewed by Richard.
2007-04-04svn merge svn+ssh://svn/svn/linden/branches/maintenance -r 59998:59999 into ↵Don Kjer
release Fix for groups showing up as 'nobody'
2007-04-04svn merge -r 59826:59968 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-04-03merge -r 59337:59951 Branch_1-14-0 -> release.Steven Bennetts
2007-04-02Fixed build for convertj2c.Steven Bennetts
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 08:28:22 +0000