208ccf8c2c
SL-24485, SL-40331, SL-23136, SL-40330, SL-25816, SL-40567,
...
SL-40568: land moss/linuxmisc-r60383: misc linuxclient & opensource
fixes.
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@60383
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxmisc-r60383 ->
release
2007-04-18 09:17:53 +00:00
0277259455
svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-04-11 17:54:18 +00:00
568397bbcc
Fixed Mac compiler warnings for deployment builds.
2007-04-07 03:23:13 +00:00
8247d5d396
Fix Mac compiler warning for deployment builds.
2007-04-07 03:22:03 +00:00
bfb21255e3
Fixed Mac deployment compiler warning (uninitialized memory read, but in unused code). Reviewed with Steve long ago.
2007-04-07 03:11:14 +00:00
e1e6ab329f
SL-39721 Run a mini-grid without editing any configuration files. Added start-servers.py and start-client.py. Renamed output executable names to "spaceserver" instead of "newspace", etc. Repaired batch files to use new executable names. Added svn ignores for new executables and intermediate files. Removed llcommon, other linden libraries from explicit linker Additional Dependencies section because this makes IncrediBuild link the libraries twice, slowing it down. Reviewed by Don.
2007-04-06 20:20:41 +00:00
3ac41f9172
fix for crash in debug mode when in renderGlyph()
...
reviewed by davep
2007-04-05 21:18:32 +00:00
2c29acbaf2
Result of svn merge -r59958:60105 svn+ssh://svn/svn/linden/branches/discard-garbage into release
2007-04-05 20:11:55 +00:00
8ffbffa33b
svn merge -r59580:59621 svn+ssh://svn/svn/linden/branches/adult-content-flag svn+ssh://svn/svn/linden/release
2007-04-05 18:58:18 +00:00
ae588e76f1
svn merge -r 58913:59058 svn+ssh://svn/svn/linden/branches/rez-content-loss-1 into release
2007-04-05 16:23:03 +00:00
2ce0fc5f18
svn merge -r 59234:60086 svn+ssh://svn/svn/linden/branches/live_lsl_help2 -> release
2007-04-05 00:59:55 +00:00
fd5608a3e7
SL-21064 Made it so you can now check physical, temporary, and phantom for multiple-selected objects. Reviewed by Richard.
2007-04-04 23:12:50 +00:00
170d61d200
svn merge svn+ssh://svn/svn/linden/branches/maintenance -r 59998:59999 into release
...
Fix for groups showing up as 'nobody'
2007-04-04 22:29:45 +00:00
98740db8fd
svn merge -r 59826:59968 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-04-04 19:49:24 +00:00
aa96d1fddf
merge -r 59337:59951 Branch_1-14-0 -> release.
2007-04-03 00:16:59 +00:00
992de40c77
Fixed build for convertj2c.
2007-04-02 23:47:50 +00:00
3a67e9102b
svn merge -r 59813:59826 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-04-02 23:27:49 +00:00
ea8fb7238e
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-31 01:41:19 +00:00
ffc6680d95
Merge of final upload-queue changes from Branch_1-13-4 --> release
...
svn merge -r 59496:59497 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-4 --> release
svn merge -r 59530:59531 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-4 --> release
svn merge -r 59827:59828 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-4 --> release
svn merge -r 59315:59316 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
In order, that's:
* back out upload-queue
* apply a subset
* apply the full thing
* re-merge the addition of the DELETE REST
Most of which turns into a no-op. Reviewed by don.
2007-03-30 17:23:42 +00:00
f01a90050f
Added highlighting for parcel flag object entry constants
2007-03-28 23:42:24 +00:00
204081b8e2
Ported MarkL's fix for SL-38277 to release from message-liberation-5. svn merge -r59784:59785 svn+ssh://svn.lindenlab.com/svn/linden/branches/message-liberation-5 into svn+ssh://svn.lindenlab.com/svn/linden/release.
2007-03-27 20:41:40 +00:00
64395d2159
Effectively: merge 59238:59702 Branch_1-13-4 --> release EXCEPT for the back out (r59497) and re-patch (r59531) of upload-queue, and fixes merged directly from Maintenance.
...
merge -r 59328:59428 Branch_1-13-4 --> release
* address regex needs "s" option to support multiline addresses. Patched previously, not sure how it got dropped.
* added new promo code to accommodate printer error
* Fix for SL-37108 "SVC-55: look at may be broken"
* Paired/reviewed with Qarl
* Release notes for Release Notes for 1.13.4(59329)
* merge release-candidate@58928 long-live-legacy-particles@59317 -> Branch_1-13-14
SKIP -r 59428:59437 (temporary), 59437:59465 (from release), 59465:59497 (back out of upload-queue)
merge -r 59497:59510 Branch_1-13-4 --> release
* SL-37932 legacy particle clean up
* SL-33228 llParticleSystem( [] ) may not shut down reliably
* SL-37909 llParticleSystem([ ]) bug now affects unlinked and root prims
SKIP -r 59510:59531 (re-patch of upload-queue)
merge -r 59531:59585 Branch_1-13-4 --> release
* blacklist and release notes updates
SKIP -r 59585:59656 (patches from maintenance)
merge -r 59656:59691 Branch_1-13-4 --> release
* blacklist and release notes updates
SKIP -r 59691:59702 (already ported to release)
2007-03-26 17:30:51 +00:00
720eab7a32
I broke linux and mac builds, reverting the changes from 59596
2007-03-22 22:03:42 +00:00
e9d8afed87
Couple steps closer to compiling on VC8, new boost headers and libs.
2007-03-22 21:24:41 +00:00
c93c38e047
svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-21 19:36:11 +00:00
fceae96eb1
svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release.
2007-03-20 22:21:42 +00:00
5e9e67cb2d
merge -r 59028:59178 maintenance -> release.
2007-03-16 20:39:40 +00:00
1ada34fc0c
merge -r58842:59035 branches/loadstone-names to release
2007-03-16 17:29:45 +00:00
9d3309f684
SL-35314 - fix many openjpeg woes. QA'd.
...
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@58887
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/SL-35314-based-on-r58887
--> release
2007-03-16 11:39:49 +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
b36dc36306
svn merge -r 58902:58986 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-09 01:09:20 +00:00
6fa974fc64
svn merge -r 58859:58902 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-08 00:25:12 +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
068558f888
merge release@58791 vc8@58828 -> release
...
Adds Dev Studio 2005 (VC8)
Reviewed by Rob
2007-03-07 02:48:44 +00:00
c4059553af
SKIPPED 58849. merge -r 58856:58859 maintenance -> release
2007-03-07 01:16:27 +00:00
3d17ddd38b
merge -r 58751:58843 maintenance -> release
2007-03-07 01:13:34 +00:00
efcd347c80
merge -r 58734:58751 maintenance -> release
2007-03-06 01:01:51 +00:00
14360b815e
merge -r 58641:58711 maintenance -> release
2007-03-06 00:37:09 +00:00
b06b9cd304
svn merge -r 58117:58118 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate (into release)
...
Port of fix for SL-35327 which was fixed in release-candidate.
2007-03-05 23:04:46 +00:00
2602986875
merge -r58599:58732 branches/im-email-base32 to release
2007-03-05 22:25:49 +00:00
1d18eb043a
merge -r57991:58444 branches/distribute/user/mute to release
2007-03-05 22:09:52 +00:00
437882ca3b
merge r58577:58578 Branch_1-13-3 to release
2007-03-05 19:08:01 +00:00
7e99d870f2
Commented out temp fast timers that got checked in.
2007-03-03 19:02:17 +00:00
4dabd9c047
merge release@58699 beta-1-14-0@58707 -> release
2007-03-02 21:25:50 +00:00
d4462963c6
merge -r 58503:58641 maintenance -> release
2007-03-02 19:11:06 +00:00
b53c377727
svn merge -r58425:58426 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate into release
2007-03-01 01:30:10 +00:00
568bb88470
Hand-ported svn diff -r58037:58038 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate by changing -megabytes value from 200 to 300. I think that is the only thing that had to happen.
2007-03-01 00:55:31 +00:00
9318da2281
svn merge -r 58437:58503 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-03-01 00:44:07 +00:00
Adam Moss