Commits

Show all
Author Commit Message Labels Comments Date
Steven Bennetts
merge -r 58285:58437 maintenance.
Josh Bell
svn merge --ignore-ancestry -r 58273:58283 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance The diff is basically a no-op since it's a reverse-merge from release itself. However, several things tried to come along for the ride, so I inspected them carefully: * Reverted libcurl changes which tried to migrate back from maintenance (see r58322) * Reverted debugging output in lltooldraganddrop.cpp, which had been added then removed again * Reverted false-positive binary conflict in libgtk-x…
richard_linden
svn merge -r 58007:58273 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
James Cook
Ported dataserver connectInventory() inventory host name hint code from loadstone-inventory-host-3 which should dramatically reduces read queries against the user table for IM processing. Reviewed by Tess.
Ryan Williams
SL-33966: Viewer installed files are not described in a centralized source 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…
Adam Moss
merge QA'd branch fixing SL-35450 Startup crash with non-english locales (linux client) svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@58131 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/SL-35450-based-on-r58131
Josh Bell
svn merge -r 57620:58007 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
richard_linden
merge -r 56779:58057 /branches/selection_management
James Cook
merge -r 57761:57967 im-email-session-3, removes database load from IM to email session tracking, introduces new format for email return addresses
Donald Kjer
svn merge -r 57708:57906 svn+ssh://svn/svn/linden/branches/don/inventory-dataserver-2
Adam Moss
Small update to the linux client readme to remove the lack of mozilla embedding from 'known issues'.
Adam Moss
Landing embedded Mozilla support for the Linux Client. svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@57782 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxmozilla-r57782base
Aaron Brashears
Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patches.001 into release.
Andrew Meadows
Fixed a missing dependency on llstring.h that was hidden until llstring.h was no longer included in lluuid.h. This fix was found by James and I verified it.
Andrew Meadows
Removed the #ifndef NO_RTTI hack. Moved the LLSD related methods of LLVector3 to NOT be inline, as per MarkL's suggestion.
Andrew Meadows
Fixed a linux build issue when the llhavok suddenly required rtti in order 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.
Mark Lentczner
merge in of error-refactor-3 concludes (fixes) SL-31187 pair programmed and reviewed by markl and karen
Steven Bennetts
merge -r 57517:57620 maintenance.
Steven Bennetts
merge -r 57111:57464 maintenance.
Josh Bell
svn merge -r 57502:57551 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-3 svn merge -r 57565:57604 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-3 (skips 57565, a merge from release. being picky.) Pick up fixes for: * Offer Teleport in profiles * Setting 'none' group * agni_check_parcel_auctions exception (pushed live already)
Aaron Brashears
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
Rob Lanphier
Making sure there's license text distributed for the Linden Lab logos that makes it clear we still are enforcing our trademarks
Steven Bennetts
merge release@57486 release-candidate@57503
Steven Bennetts
Updated vfsextract to include the correct extension for .tga, .wav, and .lla files.
Steven Bennetts
merge -r 57082:57190 Branch_1-13-2
Steven Bennetts
merge -r 57058:57111 maintenance.
Steven Bennetts
merge -r 56696:57082 Branch_1-13-2
Josh Bell
svn merge -r 57026:57058 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Steven Bennetts
merge -r 56842:57026 maintenance.
James Cook
SL-32769 Scripts now reliably register to receive email on region startup, we establish trust between dataserver and simulator explicitly on startup, reviewed by Kelly.
  1. Prev
  2. Next