Commits

Author Commit Message Labels Comments Date
Josh Bell
svn merge -r 58902:58986 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Josh Bell
svn merge -r 58859:58902 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Kelly Washington
SL-36804 Fixed offline IMs by changing source host dataserver checks to 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
Steven Bennetts
merge release@58791 vc8@58828 -> release Adds Dev Studio 2005 (VC8) Reviewed by Rob
Steven Bennetts
SKIPPED 58849. merge -r 58856:58859 maintenance -> release
Steven Bennetts
merge -r 58751:58843 maintenance -> release
Steven Bennetts
merge -r 58734:58751 maintenance -> release
Steven Bennetts
merge -r 58641:58711 maintenance -> release
Josh Bell
svn merge -r 58117:58118 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate (into release) Port of fix for SL-35327 which was fixed in release-candidate.
Kelly Washington
merge -r58599:58732 branches/im-email-base32 to release
Kelly Washington
merge -r57991:58444 branches/distribute/user/mute to release
Kelly Washington
merge r58577:58578 Branch_1-13-3 to release
Steven Bennetts
Commented out temp fast timers that got checked in.
Steven Bennetts
merge release@58699 beta-1-14-0@58707 -> release
Steven Bennetts
merge -r 58503:58641 maintenance -> release
Karen Clark
svn merge -r58425:58426 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate into release
Karen Clark
Hand-ported svn diff -r58037:58038 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate by changing -megabytes value from 200 to 300. I think that is the only thing that had to happen.
Josh Bell
svn merge -r 58437:58503 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Ryan Williams
Mac .dmgs generated by the manifest have upper-case grid names again. Refactored a lot of the command-line options so that it's more self-documenting. Now we have a --help option. Created a separate action for creating unpackeds, which is not part of the default actions (yet). This should speed up the packaging process. In the process of doing this, I also made sure to enforce the constraint that no actions are performed on the files in the destination directory…
James Cook
svn merge -r58163:58241 loadstone-sim-standby, reduces database load from standby sims polling the database for a region to run
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
  1. Prev
  2. Next