54d89549df
Making sure there's license text distributed for the Linden Lab logos that makes it clear
...
we still are enforcing our trademarks
2007-02-01 06:39:06 +00:00
934e15973e
merge release@57486 release-candidate@57503
2007-01-31 19:36:32 +00:00
565e6873de
Updated vfsextract to include the correct extension for .tga, .wav, and .lla files.
2007-01-26 00:51:34 +00:00
54a8501e57
merge -r 57082:57190 Branch_1-13-2
2007-01-26 00:50:33 +00:00
821f998373
merge -r 57058:57111 maintenance.
2007-01-25 00:18:16 +00:00
ad94bca0d2
merge -r 56696:57082 Branch_1-13-2
2007-01-24 20:21:23 +00:00
787ac69d75
svn merge -r 57026:57058 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-01-23 22:50:48 +00:00
7f50e28b0f
merge -r 56842:57026 maintenance.
2007-01-23 19:12:31 +00:00
47576ad1f7
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.
2007-01-19 00:39:03 +00:00
2d96460462
SL-32782, SL-32838, SL-32787 Viewer crashes related to god/estate owner commands not putting transaction ids into a packet. Reviewed with Kelly.
2007-01-19 00:36:55 +00:00
c189fc0b57
Result of svn merge -r56700:56797 svn+ssh://svn/svn/linden/branches/more-random into release.
2007-01-18 00:44:48 +00:00
73f0b5029a
merge -r 56738:56842 maintenance.
2007-01-18 00:36:25 +00:00
71d28bdbf0
merge release@56803 release-candidate@56833
2007-01-17 23:02:00 +00:00
fc664e93e6
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
2007-01-15 19:49:52 +00:00
aeb6d0c93c
svn merge -r 56599:56738 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-01-15 18:49:02 +00:00
dbf45ad429
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!
2007-01-13 00:06:17 +00:00
46444df6de
merge -r 56266 release-candidate
...
merge -r 56301 release-candidate
Fixes for llxfer.cpp and llaudiodecodemgr.cpp (asset upload truncation bug)
2007-01-10 22:23:45 +00:00
0fe36daf56
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56631 svn+ssh://svn.lindenlab.com/svn/linden/branches/abstract-kdu@56647 --ignore-ancestry
2007-01-10 21:54:56 +00:00
8c344f4da0
svn merge -r 56560:56599 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-01-09 20:19:31 +00:00
8534623734
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
2007-01-08 21:58:33 +00:00
fbf49910f3
svn merge -r 56431:56560 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-01-08 21:43:30 +00:00
c618a55f76
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.
2007-01-08 20:02:51 +00:00
30c9f26561
Use actual planned license header (GPL, FLOSS exception, alternative available)
...
Add floss exception doc
2007-01-06 01:31:14 +00:00
3be8a9cc11
Result of svn merge -r56461:56474 svn+ssh://svn/svn/linden/branches/llscene-shuffle into release.
2007-01-04 23:38:26 +00:00
d60f16540d
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
2007-01-04 02:04:29 +00:00
0434d35c16
Adding doc directory, with GPL license in it. Adding missing libopenjpeg.a for
...
Darwin release.
2007-01-04 02:00:37 +00:00
4617a37edf
corrected, removed, and updated comments throughout the code to be more useful. no code changes. SL-13762
2007-01-03 21:05:41 +00:00
2b291c2732
svn merge -r 54741:56417 svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew
...
Picking up some interestlist cleanup that passed testing.
2007-01-03 19:16:05 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Rob Lanphier