summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2007-03-02merge release@58699 beta-1-14-0@58707 -> releaseSteven Bennetts
2007-03-02merge -r 58503:58641 maintenance -> releaseSteven Bennetts
2007-03-01svn merge -r58425:58426 ↵Karen Clark
svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate into release
2007-03-01Hand-ported svn diff -r58037:58038 ↵Karen Clark
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.
2007-03-01svn merge -r 58437:58503 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-02-28Mac .dmgs generated by the manifest have upper-case grid names again.Ryan Williams
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 after the construct method ends. To accomplish this I simply moved some strip method calls up into the construct method. Lastly, I added our copyright notice to installer_template.nsi, and fixed a reference to a non-existant variable. Hopefully this last won't cause spurious conflicts with Callum's work. Reviewed by Richard. Also, the tabs were a little screwed up in the python files, so I untabified and all is good.
2007-02-27svn merge -r58163:58241 loadstone-sim-standby, reduces database load from ↵James Cook
standby sims polling the database for a region to run
2007-02-27merge -r 58285:58437 maintenance.Steven Bennetts
2007-02-24svn merge --ignore-ancestry -r 58273:58283 ↵Josh Bell
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-x11-2.0.so * Reverted false-positive whitespace (?) conflicts in llmail.cpp, and lldataconnector.cpp * Left a whitespace change in llselectmgr.cpp so there was something to commit
2007-02-24svn merge -r 58007:58273 ↵Richard Nelson
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-02-23Ported dataserver connectInventory() inventory host name hint code from ↵James Cook
loadstone-inventory-host-3 which should dramatically reduces read queries against the user table for IM processing. Reviewed by Tess.
2007-02-21SL-33966: Viewer installed files are not described in a centralized sourceRyan Williams
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 (Makefile_Mac, scons, and the various .bat files) still work, but they are mostly just shells for calls to viewer_manifest.py. You're now required to have python 2.3 or later on your machine to be able to package up an installer, but thankfully most people already have this.
2007-02-21merge QA'd branch fixing SL-35450 Startup crash with non-english locales (linuxAdam Moss
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
2007-02-20svn merge -r 57620:58007 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-02-17merge -r 56779:58057 /branches/selection_managementRichard Nelson
2007-02-15merge -r 57761:57967 im-email-session-3, removes database load from IM to ↵James Cook
email session tracking, introduces new format for email return addresses
2007-02-13svn merge -r 57708:57906 ↵Don Kjer
svn+ssh://svn/svn/linden/branches/don/inventory-dataserver-2
2007-02-13Small update to the linux client readme to remove the lack of mozillaAdam Moss
embedding from 'known issues'.
2007-02-12Landing embedded Mozilla support for the Linux Client.Adam Moss
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@57782 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxmozilla-r57782base
2007-02-09Result of svn merge -r57350:57790 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/os-patches.001 into release.
2007-02-07Fixed a missing dependency on llstring.h that was hidden until llstring.h ↵Andrew Meadows
was no longer included in lluuid.h. This fix was found by James and I verified it.
2007-02-07Removed the #ifndef NO_RTTI hack.Andrew Meadows
Moved the LLSD related methods of LLVector3 to NOT be inline, as per MarkL's suggestion.
2007-02-07Fixed a linux build issue when the llhavok suddenly required rtti in order ↵Andrew Meadows
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.
2007-02-06merge in of error-refactor-3Mark Lentczner
concludes (fixes) SL-31187 pair programmed and reviewed by markl and karen
2007-02-05merge -r 57517:57620 maintenance.Steven Bennetts
2007-02-05merge -r 57111:57464 maintenance.Steven Bennetts
2007-02-02svn merge -r 57502:57551 ↵Josh Bell
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)
2007-02-02Result of svn merge -r57264:57370 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-02-01Making sure there's license text distributed for the Linden Lab logos that ↵Rob Lanphier
makes it clear we still are enforcing our trademarks
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 21:00:43 +0000