Commit Graph

660 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Aaron Brashears 305c74d516 Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release. 2007-02-02 17:28:58 +00:00
Steven Bennetts 934e15973e merge release@57486 release-candidate@57503 2007-01-31 19:36:32 +00:00
Steven Bennetts ad94bca0d2 merge -r 56696:57082 Branch_1-13-2 2007-01-24 20:21:23 +00:00
Steven Bennetts 7f50e28b0f merge -r 56842:57026 maintenance. 2007-01-23 19:12:31 +00:00
Aaron Brashears 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
Josh Bell 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
Josh Bell 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
Aaron Brashears 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
Andrew Meadows 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
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00