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
87f424c64f
Merge fix for SL-46373 / VWR-1369 / Intermittent Crash on Edit from Pie Menu
...
NOTE: Only a partial merge from maintenance!!!!
svn merge -r 64309:64310 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-06-26 18:27:02 +00:00
afaeeb499c
Bumping version numbers to 1.17.2.0 for possible Rolling Server deploy
2007-06-25 23:52:16 +00:00
1b9cf00fac
Updated German text as per changes from Christian (Goetze)
...
(https://jira.lindenlab.com/browse/SL-46075 )
2007-06-25 22:22:53 +00:00
e24e6a3fed
Lost changes to some virtual function overrides.
2007-06-25 21:35:12 +00:00
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
f2c690057b
Release branded as 1.17.1.0 with release notes.
2007-06-22 21:17:31 +00:00
7235476025
Tweak initializer order to silence a gcc warning (now treated as error)
2007-06-22 20:56:24 +00:00
dd247cbad5
"Merged" over from release-candidate - addition of Japanese and German options in Installer language menu
...
Add German option to the language menu in the installer.
https://jira.lindenlab.com/browse/SL-45054
Addition of Japanese language option to the installer.
https://jira.lindenlab.com/browse/SL-45907
2007-06-22 20:31:22 +00:00
55c92418ef
svn merge -r 63401:63939 svn+ssh://svn.lindenlab.com/svn/linden/branches/derez-asset-loss-1 --> release
...
NOTE: Skipped whitespace-only changes
2007-06-22 18:23:39 +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
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
Bryan O'Sullivan