1ada34fc0c
merge -r58842:59035 branches/loadstone-names to release
2007-03-16 17:29:45 +00:00
0947e139ed
svn merge -r 58433:58660 svn+ssh://svn/svn/linden/branches/upload-queue into release
2007-03-15 00:54:39 +00:00
00dbacb215
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate@59163 --> release
2007-03-14 23:03:50 +00:00
cf40518428
merge -r 58986:59028 maintenance
2007-03-09 22:55:16 +00:00
a00d02efef
SL-36804 Fixed offline IMs by changing source host dataserver checks to check against all dataservers.
...
Added some extra warnings to odd failure cases.
Cleaned up 1 extra line of inventory connector (from merge weirdness).
reviewed with leyla
2007-03-07 20:11:50 +00:00
2602986875
merge -r58599:58732 branches/im-email-base32 to release
2007-03-05 22:25:49 +00:00
437882ca3b
merge r58577:58578 Branch_1-13-3 to release
2007-03-05 19:08:01 +00:00
4dabd9c047
merge release@58699 beta-1-14-0@58707 -> release
2007-03-02 21:25:50 +00:00
bb2b96d6c3
Ported dataserver connectInventory() inventory host name hint code from loadstone-inventory-host-3 which should dramatically reduces read queries against the user table for IM processing. Reviewed by Tess.
2007-02-23 00:48:50 +00:00
7dada07dba
svn merge -r 57620:58007 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-02-20 22:02:36 +00:00
12ac04231b
merge -r 57761:57967 im-email-session-3, removes database load from IM to email session tracking, introduces new format for email return addresses
2007-02-15 20:24:08 +00:00
5cc44523f7
Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patches.001 into release.
2007-02-09 23:35:12 +00:00
d0d4670f49
merge in of error-refactor-3
...
concludes (fixes) SL-31187
pair programmed and reviewed by markl and karen
2007-02-06 00:57:33 +00:00
77f04c74eb
merge -r 57517:57620 maintenance.
2007-02-05 21:13:38 +00:00
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
934e15973e
merge release@57486 release-candidate@57503
2007-01-31 19:36:32 +00:00
ad94bca0d2
merge -r 56696:57082 Branch_1-13-2
2007-01-24 20:21:23 +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
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
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
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
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
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Kelly Washington