summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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
2007-04-02svn merge -r 59813:59826 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-31svn merge -r 59364:59813 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-30Merge of final upload-queue changes from Branch_1-13-4 --> releaseJosh Bell
svn merge -r 59496:59497 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-4 --> release svn merge -r 59530:59531 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-4 --> release svn merge -r 59827:59828 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-4 --> release svn merge -r 59315:59316 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release In order, that's: * back out upload-queue * apply a subset * apply the full thing * re-merge the addition of the DELETE REST Most of which turns into a no-op. Reviewed by don.
2007-03-28Added highlighting for parcel flag object entry constantsKyle Machulis
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-26Effectively: merge 59238:59702 Branch_1-13-4 --> release EXCEPT for the back ↵Josh Bell
out (r59497) and re-patch (r59531) of upload-queue, and fixes merged directly from Maintenance. merge -r 59328:59428 Branch_1-13-4 --> release * address regex needs "s" option to support multiline addresses. Patched previously, not sure how it got dropped. * added new promo code to accommodate printer error * Fix for SL-37108 "SVC-55: look at may be broken" * Paired/reviewed with Qarl * Release notes for Release Notes for 1.13.4(59329) * merge release-candidate@58928 long-live-legacy-particles@59317 -> Branch_1-13-14 SKIP -r 59428:59437 (temporary), 59437:59465 (from release), 59465:59497 (back out of upload-queue) merge -r 59497:59510 Branch_1-13-4 --> release * SL-37932 legacy particle clean up * SL-33228 llParticleSystem( [] ) may not shut down reliably * SL-37909 llParticleSystem([ ]) bug now affects unlinked and root prims SKIP -r 59510:59531 (re-patch of upload-queue) merge -r 59531:59585 Branch_1-13-4 --> release * blacklist and release notes updates SKIP -r 59585:59656 (patches from maintenance) merge -r 59656:59691 Branch_1-13-4 --> release * blacklist and release notes updates SKIP -r 59691:59702 (already ported to release)
2007-03-22I broke linux and mac builds, reverting the changes from 59596Kelly Washington
2007-03-22Couple steps closer to compiling on VC8, new boost headers and libs.Kelly Washington
2007-03-21svn merge -r 59178:59364 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> 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-16SL-35314 - fix many openjpeg woes. QA'd.Adam Moss
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@58887 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/SL-35314-based-on-r58887 --> release
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-09merge -r 58986:59028 maintenanceSteven Bennetts
2007-03-09svn merge -r 58902:58986 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-08svn merge -r 58859:58902 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-07SL-36804 Fixed offline IMs by changing source host dataserver checks to ↵Kelly Washington
check against all dataservers. Added some extra warnings to odd failure cases. Cleaned up 1 extra line of inventory connector (from merge weirdness). reviewed with leyla
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-07merge -r 58751:58843 maintenance -> releaseSteven Bennetts
2007-03-06merge -r 58734:58751 maintenance -> releaseSteven Bennetts
2007-03-06merge -r 58641:58711 maintenance -> releaseSteven Bennetts
2007-03-05svn merge -r 58117:58118 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate (into release) Port of fix for SL-35327 which was fixed in release-candidate.
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-03Commented out temp fast timers that got checked in.Steven Bennetts
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 15:34:34 +0000