Commits

Show all
Author Commit Message Labels Comments Date
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.
James Cook
SL-32782, SL-32838, SL-32787 Viewer crashes related to god/estate owner commands not putting transaction ids into a packet. Reviewed with Kelly.
Aaron Brashears
Result of svn merge -r56700:56797 svn+ssh://svn/svn/linden/branches/more-random into release.
Steven Bennetts
merge -r 56738:56842 maintenance.
Steven Bennetts
merge release@56803 release-candidate@56833
Josh Bell
Port fix for SL-32157 "PowerPC Mac crashes when crossing regions or teleporting with capabilities turned on" from Branch 1-13-2 r56710 via partial merge of release-candidate -r 56743:56744
Josh Bell
svn merge -r 56599:56738 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Steven Bennetts
merge -r 56266 release-candidate 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!
Steven Bennetts
merge -r 56266 release-candidate merge -r 56301 release-candidate Fixes for llxfer.cpp and llaudiodecodemgr.cpp (asset upload truncation bug)
Jon Wolk
Josh Bell
svn merge -r 56560:56599 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Josh Bell
Showstopper merge from maintenance 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
Josh Bell
svn merge -r 56431:56560 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Josh Bell
svn merge -r 56262:56561 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.
  1. Prev
  2. Next