f118e7c80b
result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release
2007-06-13 18:02:37 +00:00
680667d4bd
svn merge -r 62560:62559 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
...
Revert bad patch for VWR-849 / SL-43759
2007-06-12 21:41:54 +00:00
65c038685f
fix for crash because of recent changes in tool handleSelect() from Richard. SL-44935
2007-06-11 22:11:02 +00:00
28435a0898
NOTE: Partial merges of the maintenance branch up. The bulk of maintenance 62831:63347 is awaiting final QA and merging, post 1.17.0
...
svn merge -r 63182:63183 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
svn merge -r 63341:63342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
svn merge -r 63420:63421 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Rush in the following fixes:
* SL-27250 "Stop All Animations" doesn't work when stuck in a pose after teleporting
* SL-44718 VWR-1040: crash when opening several gestures quickly
* SL-44326 recurring error message in agni nightly #1
2007-06-11 18:24:15 +00:00
309b56280b
svn merge -r 63284:63298 svn+ssh://svn/svn/linden/branches/content-loss-metrics-4 into release
2007-06-09 21:27:18 +00:00
61324a18b9
Removing a bug that addressed a coverity defect. This change is done in maintenance, r-c, and release. Maintenance r63092 Reviewed by Richard.
2007-06-05 22:41:07 +00:00
e61a10ec5b
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-06-04 18:46:59 +00:00
3e9872a297
merge -r61423:62602 svn/branches/maintenance --> release
2007-05-30 17:39:09 +00:00
7b61f1d0ec
land mozilla-https-fix branch, -> release
2007-05-26 00:50:37 +00:00
029130bf9c
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release
2007-05-23 21:17:34 +00:00
0aac2f674e
Copyright info added to llcurl
2007-05-21 21:42:21 +00:00
ba9d38e3dd
Merge all of the patches made to Branch_1-15-1 back into release:
...
* Release notes for 1.15.1(3)
* Updated contributors list
* Revert apr libraries (NOTE: Also done in maintenance, this should be a no-op...)
* Fix for SL-42640 Entering appearance mode triggers "items coming too fast"
* Fix for SL-42257 Mute Resident button does not open the user picker
svn merge -r 61568:61569 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release
svn merge -r 61585:61586 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release
svn merge -r 61601:61602 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release
svn merge -r 61761:61762 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release
svn merge -r 61777:61778 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release
svn merge -r 61805:61806 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release
svn merge -r 61824:61825 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release
2007-05-15 21:15:05 +00:00
03748c42ae
Version 1.15.2.0 (serverside only).
2007-05-15 16:10:41 +00:00
a154ec72f7
svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into release
2007-05-08 22:20:26 +00:00
60a09f20f4
Removing Logitech LCD code: svn merge -r 60616:60615 svn+ssh://svn/svn/linden/release into release
2007-05-08 20:42:04 +00:00
a7c687350e
Version 1.15.1.0.
2007-05-07 23:22:05 +00:00
9f59160b9c
merge -r61253:61354 branches/friends_1-15 to release, minus some spam.
2007-05-07 20:34:23 +00:00
b69bf6e1f9
svn merge -r 61367:61368 svn+ssh://svn/svn/linden/branches/maintenance into release -- porting test spam removal
2007-05-07 19:17:30 +00:00
70aaa3e444
svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into release
2007-05-04 21:57:06 +00:00
08d746156b
Result of svn merge -r59717:60410 svn+ssh://svn/svn/linden/branches/adroit.2007-03-13 into release.
2007-05-03 21:48:14 +00:00
5de49ccb32
Attempt to revert release r61312 checkin. Whitespace only
2007-05-03 18:34:55 +00:00
5d0cbafc85
Reverting check-in to release with no QA... svn merge svn+ssh://svn/svn/linden/release -r 61312:61311
2007-05-03 16:01:43 +00:00
1f9058065c
Solves SL-23488
2007-05-03 02:53:18 +00:00
9ea022f493
Syncing missing changes in maintenance to release
2007-05-03 02:20:59 +00:00
d09692bf1d
Syncing up missing changes from release-candidate
2007-05-03 00:30:29 +00:00
1c909afe39
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
2007-05-02 21:24:47 +00:00
bc59c04653
svn merge -r 61255:61259 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate --> release
2007-05-02 20:29:59 +00:00
eb3731a3ca
svn merge -r 61099:61168 svn+ssh://svn/svn/linden/branches/release-candidate into release
2007-05-01 21:52:29 +00:00
4ecb9cb63e
svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release
2007-05-01 21:39:25 +00:00
f5e9ce7e47
Font notices
2007-04-24 18:57:05 +00:00
2f438a409e
svn merge -r 59608:60615 svn+ssh://svn.lindenlab.com/svn/linden/branches/jakesbranch --> release
...
Adding Logitech G15 keyboard and Z10 speaker support for those LCD windows.
2007-04-18 21:08:54 +00:00
c94062fb5b
Found a few more source/data files that were executable. Bits -> bitbucket
2007-04-18 16:59:05 +00:00
a5b2d150ad
A handful of source files had the svn:executable property set. Not any more.
2007-04-18 16:52:12 +00:00
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
Aaron Brashears