b699ae454d
merge -r67812:67818 svn+ssh://svn.lindenlab.com/svn/linden/branches/windlight-server/ --> release
2007-08-16 00:59:41 +00:00
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
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
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
52cb2aea86
svn merge -r67131:67483 svn+ssh://svn/svn/linden/branches/Branch_1-18-1
2007-08-08 00:55:57 +00:00
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
05d73c569a
Duckless Vandyke did not contribute VWR-383, Thraxis Epsilon did
2007-08-04 00:24:02 +00:00
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
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
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
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
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
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
e27e86e033
merge -r 66456:66594 Branch_1-18-1 -> release
...
Includes voice-server-changes (0:66493)
2007-07-27 21:54:03 +00:00
ef32d1d6b0
merge -r66262:66263 linden/branches/kelly/llgetobjectdetails-2
2007-07-26 16:51:08 +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
4284da1787
fix up copyrights on asset gc files
2007-07-25 22:44:05 +00:00
87955ce1eb
asset garbage collection scripts
2007-07-25 17:35:44 +00:00
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
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
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
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
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
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
c78f99b0b3
Result of svn merge -r65354:66054 svn+ssh://svn/svn/linden/branches/ezrpc into release
2007-07-20 16:25:43 +00:00
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
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
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
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
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
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
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
3f41fdbfcf
Fix build borkage on OS X.
2007-07-12 22:33:48 +00:00
42f7199fdb
svn merge -r65092:65220 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance-r64837
2007-07-12 22:18:34 +00:00
b55c8fe2da
Fixed a build error under XCode due to unused file static variable.
2007-07-11 22:30:16 +00:00
6502ae1ad8
Missed a conflict marker in release-candidate to release merge.
2007-07-11 22:23:21 +00:00
35bcaa9655
svn merge -r 65078:65118 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate --> release
...
Sync up last minute patches that went into 1.18.
2007-07-11 22:11:22 +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
a6769f262f
SL-47720 Crash on startup due to SSE instructions. Disable SSE code generation on Windows build. This prevents global constants from being initialized with SSE instructions. We can use the SSE code on Intel Mac (since they all support SSE) and if we enable SSE compilation for the entire Windows viewer. Reviewed by Kelly.
2007-07-11 21:10:53 +00:00
873b83c242
Documented what we're testing and why.
2007-07-09 04:04:34 +00:00
528b1ef2af
Version 1.17.3.0.
2007-07-05 21:41:13 +00:00
93c9c1facd
Fixed broken Mac universal build due to missing files and bad LL_VECTORIZE ifdef for sse-skinning code.
2007-07-03 18:16:13 +00:00
cc40373a05
Fixed VS8 project files for sse-skinning merge.
2007-07-03 00:50:23 +00:00
1a33bc19b4
svn merge -r 62595:62596 and 62598:63308 sse-skinning-3 for faster software avatar rendering. Visual Studio 2005 project file fixed pending.
2007-07-02 23:52:40 +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
ce5e13630c
Backed out revision 64585. Not reviewed.
2007-06-30 02:31:48 +00:00
58cb2c83ae
Version 1-17-2-64582 based on svn revision 64582.
2007-06-30 02:04:06 +00:00
ad04e5fc55
revert: svn merge -r 64506:64505 svn+ssh://svn/svn/linden/release back into release
...
reverting jakes accidental check in
2007-06-29 01:49:41 +00:00
e3989d3848
Changes to make Logitech code more LL Code Standards compliant, plus remove all the SDK code and instead just used headers and an included lib that we build ourselves from the Trunk directory.
2007-06-29 01:24:26 +00:00
010d402456
Setting some shader svn:eol-style properties to native to prevent conflicts in windlight4 branch.
2007-06-28 18:00:06 +00:00
Karl Steifvater