livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
79,965 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

1929 Commits (master)

Author SHA1 Message Date
Josh Bell e3d0761b5e svn merge -r 68785:68784 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance 
Revert change for SL-51198 ("VWR-2072: New Feature -> UI -> IM -> Teleport (other person) Button"), per Ben - more comprehensive design coming through Rx soon.
 2007-09-17 16:01:11 +00:00
Don Kjer 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
Josh Bell b3d807d5ff svn merge -r 68690:69597 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release 
Merge patches made in the 1-18-3 RC iterations into the trunk.
NOTE: Includes the reversion of SL-51274 (originally maintenance r67559, changed lltracker.cpp)
 2007-09-13 18:17:52 +00:00
Josh Bell 6d2c503f61 svn merge -r 68474:68690 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release 
Sync up fixes, version numbers, and release notes applied to the viewer RC branch.
 2007-08-28 21:19:20 +00:00
Christian Goetze 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
Rob Lanphier 057a5646c1 Fixing typo in contributor name (Fee Larsson->Feep Larsson) and removing another instance of Duckless VanDyke being 
credited where he/she should not have been
 2007-08-04 01:14:40 +00:00
Rob Lanphier 05d73c569a Duckless Vandyke did not contribute VWR-383, Thraxis Epsilon did 2007-08-04 00:24:02 +00:00
Don Kjer 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
Don Kjer d373dcc7cb svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release 
* WARNING *:  maintenance r64837 is not the last rev to use in the next merge. use r65269
 2007-07-20 20:38:05 +00:00
Bryan O'Sullivan fbb133a46a svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 
(everything outside of indra, missing some file additions)

(josh) Original log message was:
   svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
   svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
   svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
 2007-07-18 21:25:13 +00:00
Don Kjer e5124431b5 svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-07-02 17:10:30 +00:00
Josh Bell 69383de1e7 svn merge -r 63827:63826 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 
Revert fix for SL-33506/VWR-53, which was causing SL-46205 "Head is invisible in appearance editor"
 2007-06-25 20:08:57 +00:00
Kelly Washington e03bb0606a merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
Josh Bell e61a10ec5b svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-06-04 18:46:59 +00:00
Kelly Washington 3e9872a297 merge -r61423:62602 svn/branches/maintenance --> release 2007-05-30 17:39:09 +00:00
Josh Bell 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
Don Kjer 70aaa3e444 svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-04 21:57:06 +00:00
Don Kjer 1c909afe39 svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-02 21:24:47 +00:00
Adam Moss 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
Josh Bell 98740db8fd svn merge -r 59826:59968 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-04-04 19:49:24 +00:00
Josh Bell c93c38e047 svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-03-21 19:36:11 +00:00
Adam Moss 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
Josh Bell 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
Steven Bennetts 4dabd9c047 merge release@58699 beta-1-14-0@58707 -> release 2007-03-02 21:25:50 +00:00
Aaron Brashears 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
Rob Lanphier 54d89549df Making sure there's license text distributed for the Linden Lab logos that makes it clear 
we still are enforcing our trademarks
 2007-02-01 06:39:06 +00:00
Jon Wolk 0fe36daf56 svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56631 svn+ssh://svn.lindenlab.com/svn/linden/branches/abstract-kdu@56647 --ignore-ancestry 2007-01-10 21:54:56 +00:00
Rob Lanphier 30c9f26561 Use actual planned license header (GPL, FLOSS exception, alternative available) 
Add floss exception doc
 2007-01-06 01:31:14 +00:00
Rob Lanphier 0434d35c16 Adding doc directory, with GPL license in it. Adding missing libopenjpeg.a for 
Darwin release.
 2007-01-04 02:00:37 +00:00