f41b7bb8df
-74901 (back out premature commit to release)
2007-12-03 19:44:04 +00:00
d5eef2d8a6
merge -r 73391:74133 maint-ui-3 -> release
2007-12-03 19:36:44 +00:00
78aec043f3
svn merge -r 73148:74186 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release
2007-11-21 02:10:12 +00:00
c1920e3c1c
EFFECTIVE MERGE: svn merge -r 70833:71458 svn+ssh://svn/svn/linden/branches/maintenance-2 into release
...
ACTUAL MERGE: svn merge -r 73210:73222 svn+ssh://svn/svn/linden/qa/maintenance-2-merge-73206 into release
2007-11-09 01:56:15 +00:00
050dad0ce3
merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079
2007-11-07 22:55:27 +00:00
0f00eef217
svn merge -r 71509:72877 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-4-Viewer --> release
...
Backport patches and translations from RC branch
2007-11-01 23:10:05 +00:00
7afa8058aa
svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release
...
QAR-11: pair-reviewed the merge w/ Sam.
2007-11-01 22:02:35 +00:00
5ec8bbbe22
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
2007-10-10 00:01:43 +00:00
5595a99623
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04 23:19:43 +00:00
13c391f198
EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/maintenance
...
ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync
EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999
2007-09-14 21:13:20 +00:00
b2595c369f
Merge sl-search-opt-in back into the release branch
...
Reviewed by Josh and Don
2007-08-30 22:11:52 +00:00
ce0a5fe145
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
...
Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-08-21 22:17:53 +00:00
7138fb673a
Merge down from Branch_1-18-1:
...
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
2007-08-02 01:18:34 +00:00
9746cf5310
EFFECTIVE MERGE: svn merge -r 65485:66133 svn+ssh://svn/svn/linden/branches/maintenance into release
...
This includes fixes to the maintenance-r66133 branch, and sync'ing up with release@r66392
ACTUAL MERGE: svn merge -r 66394:66435 svn+ssh://svn/svn/linden/branches/release-r66392 into release
EQUIVALENT TO: svn merge -r 65485:66434 svn+ssh://svn/svn/linden/branches/maintenance-r66133 into release (plus branch sync'ing)
2007-07-26 01:22:23 +00:00
57b8fef824
svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
2007-07-11 21:29:02 +00:00
e5124431b5
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
2007-07-02 17:10:30 +00:00
e03bb0606a
merge -r62831:64079 branches/maintenance to release
2007-06-21 22:40:22 +00:00
2638f12f95
svn merge -r 63833:63894 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-17-0 --> release
...
Pick up patches committed to 1.17:
* Commented out metrics code that seems to be causing a crash.
* Adding metrics to deployed code. added missing __hash__ function to lluuid.py, which fixes using uuid's as keys in maps
* Reverting fix for SL-25905; probably cause of script-vieweing exploit on agni.
* Removed deploy key checks from farm
2007-06-17 22:27:09 +00:00
3e9872a297
merge -r61423:62602 svn/branches/maintenance --> release
2007-05-30 17:39:09 +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
a154ec72f7
svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into release
2007-05-08 22:20:26 +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
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
ea8fb7238e
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-31 01:41:19 +00:00
5e9e67cb2d
merge -r 59028:59178 maintenance -> release.
2007-03-16 20:39:40 +00:00
4dabd9c047
merge release@58699 beta-1-14-0@58707 -> release
2007-03-02 21:25:50 +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
647d29b1a2
merge -r 58285:58437 maintenance.
2007-02-27 01:03:39 +00:00
73bc0fb42b
merge -r 56779:58057 /branches/selection_management
2007-02-17 03:02:16 +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
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
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
Steven Bennetts