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

79965 Commits (master)

Author SHA1 Message Date
Rob Lanphier 2add0e15d7 Fixing problem in credits created by the reversion of VWR-2074 
It appears the credit for VWR-333 was part of that checkin, but the actual
code for VWR-333 was checked in earlier.
 2007-09-20 05:55:02 +00:00
Melinda Green 07c24d0437 Passed QA, merging minifriends-3:70006 back to release 2007-09-19 21:28:44 +00:00
Aaron Brashears 33ce57b485 Result of svn merge -r68268:69863 svn+ssh://svn/svn/linden/branches/entity-router into release. 2007-09-19 16:59:05 +00:00
James Cook baa51d59e1 svn merge -r 69906:69926 svn+ssh://svn.lindenlab.com/svn/linden/branches/lag-meter. Adds "Lag Meter" option to "Help" menu to give users more useful diagnostics when they see "laggy" behavior. 2007-09-19 04:52:01 +00:00
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 a5f3ac2a8d svn merge -c 68578 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release 
Re-apply reversion from RC branch. This was un-reverted by the dpo-4 merge.
 2007-09-13 17:48:39 +00:00
Josh Bell 8f530bb156 svn merge -c 68568 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release 
Re-apply reversion from RC branch. This was un-reverted by the dpo-4 merge.
 2007-09-13 17:21:21 +00:00
Aaron Brashears 3d58b54f0e Result of svn merge -r64890:69433 svn+ssh://svn/svn/linden/branches/dpo-4 into release. had to blow away the libraries directory to clear up svn evil. 2007-09-13 00:51:23 +00:00
Sam Kolb 55e52f3631 Merge sl-search-m0 back into release 2007-09-11 20:48:08 +00:00
Adam Moss 96830697b2 SL-53811, SL-53812, SL-53823, SL-26604, SL-54282 Linux filepickers 
revamp.

Passed by QA.  Reviewed by bos.

svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@68938
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/SL-26604-based-on-r68938
-> release
 2007-09-10 20:15:48 +00:00
Aaron Brashears 80dfa222fd Result of svn merge -r69150:69158 svn+ssh://svn/svn/linden/branches/named-queries-py3 into release. 2007-09-10 20:10:56 +00:00
Steven Bennetts 0bd992b07c SL-51287 Muted users not visibly shown anymore 
SL-54168 "Users muted by voice are also muted by text".
Updated Vivox SDK 2.0.2318.

(josh: This appears to be svn merge -r 68529:69170 svn+ssh://svn/svn/linden/branches/bhear3-maintenance1)
 2007-09-07 22:31:26 +00:00
Sam Kolb b2595c369f Merge sl-search-opt-in back into the release branch 
Reviewed by Josh and Don
 2007-08-30 22:11:52 +00:00
Bryan O'Sullivan 84ea29c69c svn merge -r67650:68653 branches/release-viewer-stats 
Branch reviewed by Don.  Passed QA buildme this morning.

NOTE: This change requires a DB schema upgrade.  Upgrade script:
indra/upgrade/viewer-stats/redo_viewer_stats
 2007-08-29 00:08:01 +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
Karl Steifvater b699ae454d merge -r67812:67818 svn+ssh://svn.lindenlab.com/svn/linden/branches/windlight-server/ --> release 2007-08-16 00:59:41 +00:00
Josh Bell e8e6679454 svn merge -r 67483:67657 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1 
This is "really" the merge of everything that went out in the 1.18.2(0) viewer release.
 2007-08-14 00:27:49 +00:00
Josh Bell d6fc7e6e61 * Update versions (client + server) to 1.18.2.0 
* Tweak simulator_version script to slam all regions to the new version we're deploying
 2007-08-14 00:14:37 +00:00
Tess Chu 3b2515fd5f merge -r 66233:67472 svn+ssh://svn/svn/linden/branches/het-grid-4 Paired by Tess and Leyla. 
Added tests to version manager and fixed failed tests.  Paired by rdw and Tess.
 2007-08-10 02:15:37 +00:00
Kartic Krishnamurthy 52cb2aea86 svn merge -r67131:67483 svn+ssh://svn/svn/linden/branches/Branch_1-18-1 2007-08-08 00:55:57 +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
Aaron Brashears b387b98bd0 Result of svn merge -r67150:67159 svn+ssh://svn/svn/linden/branches/mp-backbone-2 into release. 2007-08-02 19:05:10 +00:00
Monroe Williams 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
Aaron Brashears f6a10b3214 Result of svn merge -r66742:66741 svn+ssh://svn/svn/linden/release in release to revert revision 66742 which was a merge from mp-backbone. 2007-08-01 22:12:00 +00:00
Melinda Green a8ee4f5787 svn merge -r 64468:66735 svn+ssh://svn/svn/linden/branches/lookatyou/indra/newview > release/indra/newview 2007-07-31 22:01:05 +00:00
Aaron Brashears edaad27201 Result of svn merge -r66103:66418 svn+ssh://svn/svn/linden/branches/mp-backbone into release 2007-07-30 19:45:53 +00:00
Ryan Williams 24c0e384fa New mysql connection pool for Python, plus unit tests that verify that it's actually non-blocking. Some additional behavior in saranwrap, with tests that pass. Reviewd by Donovan. 2007-07-27 22:08:25 +00:00
Steven Bennetts e27e86e033 merge -r 66456:66594 Branch_1-18-1 -> release 
Includes voice-server-changes (0:66493)
 2007-07-27 21:54:03 +00:00
Kelly Washington ef32d1d6b0 merge -r66262:66263 linden/branches/kelly/llgetobjectdetails-2 2007-07-26 16:51:08 +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
Seth Alves 4284da1787 fix up copyrights on asset gc files 2007-07-25 22:44:05 +00:00
Seth Alves 87955ce1eb asset garbage collection scripts 2007-07-25 17:35:44 +00:00
Ryan Williams 1f4ffb0d7a Minor bugfixes for a line in viewer_manifest that never gets run (because of the way the SConstruct file on Linux is built). However, it might get run in the future, so there we go. Thanks cg for finding this. Not reviewed. 2007-07-24 06:09:13 +00:00
Ryan Williams 7769191414 Added much more error-recovery logic to template-verifier -- e.g. it retries a few times to fetch the master from the web. Also I changed the master to live in the system global tempdir, mostly because the build machines had a network problem and I wanted to reduce the chance of that happening. Not reviewed, but I'm checking it in over the weekend so I can silently fix it if there's yet another weird configuration difference that breaks it on the build machines. 2007-07-22 06:29:36 +00:00
Kartic Krishnamurthy 45281046c5 Fixed cache invalidation in simulator.cpp, llsd.php, added RFC 1123 compliant date format, and unit test for the new date function 2007-07-20 23:11:04 +00:00
Ryan Williams dd6a0467ed Fix parabuild breakage. Why the F is urllib opening an ftp connection to localhost? Not reviewed. 2007-07-20 22:10:59 +00:00
Ryan Williams 987d14fd46 SL-49406: template_verifier.py requires network access to build. Implemented a 4-hour cache so it hits the network less often overall (saving approx .5 seconds every build), and added fault tolerance for when it fails to fetch the master over the network. It'll whine at you if it can't fetch it, but even if it can't get the master from the network and doesn't have a cached copy at all, it will still at least do a syntax check on the local template. 2007-07-20 21:49:31 +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
Aaron Brashears c78f99b0b3 Result of svn merge -r65354:66054 svn+ssh://svn/svn/linden/branches/ezrpc into release 2007-07-20 16:25:43 +00:00
Ryan Williams 168794a0f3 Replaced usage of urlopen.read(), which isn't guaranteed to return all of the downloaded bytes, with urlopen.readlines(), which (I believe) does have that guarantee. This should fix the rash of mysteriously-failing prebuilds. In the process, added some better error messaging about whether the local template has the parse error, or the master on the network. Also some reorganization. Reviewed by Tess and Leyla. 2007-07-19 01:09:12 +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
Bryan O'Sullivan ce7682c2a4 svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 
(only inside indra)

(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:22:40 +00:00
Kartic Krishnamurthy e1ab7d8a30 svn merge -r63705:65463 svn+ssh://svn/svn/linden/branches/dpo-3-bug-fix 
NOTE: r63705 is *not* the earliest rev# for dpo-3-bug-fix.
 2007-07-18 01:28:59 +00:00
Aaron Brashears 7964c6f7a5 Result of svn merge -r65183:65337 svn+ssh://svn/svn/linden/branches/python-shuffle into release. Also includes untabification of many python files. 2007-07-16 20:29:28 +00:00
Aaron Brashears 88d7d45316 Result of svn merge -r65183:65337 svn+ssh://svn/svn/linden/branches/python-shuffle into release. 2007-07-16 20:16:05 +00:00
Adam Moss a994cc3775 SL-24190 'Streaming video support for Linux' 
QA'd.

svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@65172
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/SL-24190i-based-on-r65172
 2007-07-16 19:20:06 +00:00