summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2007-06-17svn merge -r 63833:63894 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-06-13result of merge manually performed through diff and patch. svn diff svn+ssh:/...Aaron Brashears
2007-06-12svn merge -r 62560:62559 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-06-11fix for crash because of recent changes in tool handleSelect() from Richard. ...Aaron Brashears
2007-06-11NOTE: Partial merges of the maintenance branch up. The bulk of maintenance 62...Josh Bell
2007-06-09svn merge -r 63284:63298 svn+ssh://svn/svn/linden/branches/content-loss-metri...Don Kjer
2007-06-05Removing a bug that addressed a coverity defect. This change is done in main...Anthony Foster
2007-06-04svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
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 svn+ssh://svn....Brad Kittenbrink
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
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 r...Don Kjer
2007-05-08Removing Logitech LCD code: svn merge -r 60616:60615 svn+ssh://svn/svn/linden...Don Kjer
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 r...Don Kjer
2007-05-04svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-05-03Result of svn merge -r59717:60410 svn+ssh://svn/svn/linden/branches/adroit.20...Aaron Brashears
2007-05-03Attempt to revert release r61312 checkin. Whitespace onlyArthur Abraham
2007-05-03Reverting check-in to release with no QA... svn merge svn+ssh://svn/svn/linde...Don Kjer
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 r...Don Kjer
2007-05-02svn merge -r 61255:61259 svn+ssh://svn.lindenlab.com/svn/linden/branches/rele...Josh Bell
2007-05-01svn merge -r 61099:61168 svn+ssh://svn/svn/linden/branches/release-candidate ...Don Kjer
2007-05-01svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate ...Don Kjer
2007-04-24Font noticesRob Lanphier
2007-04-18svn merge -r 59608:60615 svn+ssh://svn.lindenlab.com/svn/linden/branches/jake...Jake Simpson
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
2007-04-11svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
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 unus...James Cook
2007-04-06SL-39721 Run a mini-grid without editing any configuration files. Added star...James Cook
2007-04-05fix for crash in debug mode when in renderGlyph()Richard Nelson
2007-04-05Result of svn merge -r59958:60105 svn+ssh://svn/svn/linden/branches/discard-g...Aaron Brashears
2007-04-05svn merge -r59580:59621 svn+ssh://svn/svn/linden/branches/adult-content-flag ...Kyle Machulis
2007-04-05svn merge -r 58913:59058 svn+ssh://svn/svn/linden/branches/rez-content-loss-1...Don Kjer
2007-04-05svn merge -r 59234:60086 svn+ssh://svn/svn/linden/branches/live_lsl_help2 -> ...Richard Nelson
2007-04-04SL-21064 Made it so you can now check physical, temporary, and phantom for mu...Dave Kaprielian
2007-04-04svn merge svn+ssh://svn/svn/linden/branches/maintenance -r 59998:59999 into r...Don Kjer
2007-04-04svn merge -r 59826:59968 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-04-03merge -r 59337:59951 Branch_1-14-0 -> release.Steven Bennetts
2007-04-02Fixed build for convertj2c.Steven Bennetts