summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2007-01-31merge release@57486 release-candidate@57503Steven Bennetts
2007-01-26Updated vfsextract to include the correct extension for .tga, .wav, and .lla ↵Steven Bennetts
files.
2007-01-26merge -r 57082:57190 Branch_1-13-2Steven Bennetts
2007-01-25merge -r 57058:57111 maintenance.Steven Bennetts
2007-01-24merge -r 56696:57082 Branch_1-13-2Steven Bennetts
2007-01-23svn merge -r 57026:57058 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-01-23merge -r 56842:57026 maintenance.Steven Bennetts
2007-01-19SL-32769 Scripts now reliably register to receive email on region startup, ↵James Cook
we establish trust between dataserver and simulator explicitly on startup, reviewed by Kelly.
2007-01-19SL-32782, SL-32838, SL-32787 Viewer crashes related to god/estate owner ↵James Cook
commands not putting transaction ids into a packet. Reviewed with Kelly.
2007-01-18Result of svn merge -r56700:56797 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/more-random into release.
2007-01-18merge -r 56738:56842 maintenance.Steven Bennetts
2007-01-17merge release@56803 release-candidate@56833Steven Bennetts
2007-01-15Port fix for SL-32157 "PowerPC Mac crashes when crossing regions or ↵Josh Bell
teleporting with capabilities turned on" from Branch 1-13-2 r56710 via partial merge of release-candidate -r 56743:56744
2007-01-15svn merge -r 56599:56738 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-01-13merge -r 56266 release-candidateSteven Bennetts
merge -r 56301 release-candidate Fixes for llxfer.cpp and llaudiodecodemgr.cpp (asset upload truncation bug) llxfer.cpp got missed somehow the first time round, grr!
2007-01-10merge -r 56266 release-candidateSteven Bennetts
merge -r 56301 release-candidate Fixes for llxfer.cpp and llaudiodecodemgr.cpp (asset upload truncation bug)
2007-01-10svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56631 ↵Jon Wolk
svn+ssh://svn.lindenlab.com/svn/linden/branches/abstract-kdu@56647 --ignore-ancestry
2007-01-09svn merge -r 56560:56599 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-01-08Showstopper merge from maintenanceJosh Bell
svn merge -r 56564:56570 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance NOTE: This skips -r 56560:56464 which should be merged after being QA'd
2007-01-08svn merge -r 56431:56560 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-01-08svn merge -r 56262:56561 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-1 Reviewed by doug. This code is running on Agni, but needed to merge into doug's new nightly stuff.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 00:29:12 +0000