Commits

Show all
Author Commit Message Labels Comments Date
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.
Rob Lanphier
Use actual planned license header (GPL, FLOSS exception, alternative available) Add floss exception doc
Aaron Brashears
Result of svn merge -r56461:56474 svn+ssh://svn/svn/linden/branches/llscene-shuffle into release.
Josh Bell
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431 This turned up the following "lost" changes: llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly llfontgl.cpp (from maintenance r50207) - whitespace only inventorybridge.cpp (property - non-executable) skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL
Rob Lanphier
Adding doc directory, with GPL license in it. Adding missing libopenjpeg.a for Darwin release.
Aaron Brashears
corrected, removed, and updated comments throughout the code to be more useful. no code changes. SL-13762
Andrew Meadows
svn merge -r 54741:56417 svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew Picking up some interestlist cleanup that passed testing.
James Cook
Print done when done.
Tags
v2start
  1. Prev
  2. Next