711b9749a1
DEV-9328 DEV-9330 DEV-9334 Fixed license information in source files to match the wiki [[License Substition]] standard. Commit to release OK by Josh/Jwolk.
2008-01-24 20:26:50 +00:00
e7a8acadc4
svn merge -r76807:77355 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
...
Pick up fixes made to 1.18.6 Viewer, including:
* DEV-8584 Replace "Second Life" with Channel name in viewer crash log reports
* DEV-8384 Connect button doesn't enable
* DEV-8408 Unable to edit First/last name and password fields in viewer login
* DEV-8423 VWR-3948: Underlayers no longer removable by pie menu in Windlight, release candidates
* DEV-8557 Crash on login page when using Logitech LCD Keyboard
* DEV-8507 Crash reporter has no default server to send to when crashing before agent connect
* DEV-8531 viewer_manifest.py broken for 64-bit builds
* DEV-8286 German Translation of the "Release Keys" tab is incorrect
* DEV-7419 Unable to set 'Group Access' for land that is also 'Public Access' (Was VWR-3667)
* DEV-6851 Integrate html error page with client
2008-01-12 00:43:42 +00:00
e1d4097222
svn merge -r76651:76807 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
...
Pick up fixes for:
* DEV-7598 VWR-3829: Cursor in Logon edit boxes difficult to see
* DEV-8125 Language names need to have a consistent format in preferences drop-down
* DEV-8099 SVC-1125: New Search: Beacons aren't shown when teleporting to regions with "Allow Direct Teleport" disabled
* DEV-8107 Crash when connecting to older sims in llviewerparcelmgr age verification code
* DEV-8130 Remove "Alternate Server" option from crash reporter since util.* no longer have public interfaces
* DEV-7372 VWR-3748: Builds fail on 1.18.6 RC if not using MOZLIB due to missing #if LL_LIBXUL_ENABLED in 3 places in indra/newview/llpanellogin.cpp
Plus corrected line endings for llcrashlogger.* (there's one actual change in those files, the rest is whitespace)
2008-01-03 20:00:23 +00:00
b6e2a894f5
svn merge -r76207:76805 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server --> release
...
Pick up patches for:
* DEV-7727 Simcrash caused by bots sitting on trees
* DEV-8091 No-Copy can be circumvented by coalescing object with a Linden plant
* QAR-173 Add content negotiation to login.cgi and transform.cgi so people can log in with llsd instead of xmlrpc
2008-01-03 19:53:12 +00:00
2ec9ba8446
D'oh, try compiling before committing. (If it's any justification, CG was compiling so I could run home...)
2007-12-29 01:45:54 +00:00
d06e5e3519
svn merge -r 76642:76643 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-4-merge-76640
...
Redo of QAR-170, with correct range. Reviewed by CG.
2007-12-29 01:40:57 +00:00
79680891a7
svn merge -r 76394:76651 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer to pick up LLURI escaping fix and all other changes since last sync. Not reviewed.
2007-12-28 22:19:29 +00:00
df4d167cd1
svn merge -r74200:76302 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
...
Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome.
2007-12-21 06:44:41 +00:00
8fde5f0d32
svn merge -r74912:76207 svn+ssh://svn/svn/linden/branches/Branch_1-18-6-Server -> release
2007-12-20 23:48:13 +00:00
6c6987e8a3
svn merge -r75015:75150 svn+ssh://svn/svn/linden/branches/security-lsl-setname --> release
...
QAR-146 Merge of fix for DEV-6375/SVC-997: llSetObjectName / Desc not properly capped.
2007-12-19 20:17:08 +00:00
7dd08303a3
svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134
2007-12-19 00:56:59 +00:00
b01d567a5d
EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 -> maint-viewer-2-merge
...
EFFECTIVE MERGE: merge -r 74370 library-update -> maint-viewer-2-merge
ACTUAL MERGE: release@75267 maint-viewer-2-merge@75293 -> release
2007-12-07 20:27:13 +00:00
a64f283477
Switching from XML streaming to Notation streaming for new streambase logging format.
2007-12-06 23:50:17 +00:00
2c89da4c6f
EFFECTIVE MERGE: svn -r 74436:74675 svn+ssh://svn/svn/linden/branches/log-streambase-1
...
ACTUAL MERGE: svn merge -r 75220:75225 svn+ssh://svn/svn/linden/qa/log-streambase-1-merge-75217
2007-12-06 23:43:36 +00:00
facf67ae32
EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release
...
ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release
2007-12-05 23:43:56 +00:00
90aa2ddb2e
svn merge -r 74415:74849 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release
...
Last of the fixes from 1.18.5 Viewer RC series
2007-12-03 21:41:38 +00:00
7b7dd4e6f6
svn merge -r74808:74832 svn+ssh://svn/svn/linden/branches/qa-dpo-9a
2007-12-01 01:29:28 +00:00
f5d50760d8
Pick up patches from 1.18.6 production branch
...
svn merge -c 74225 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -c 74273 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -c 74366 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -c 74424 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -c 74444 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -r 74473:74631 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
2007-11-28 23:12:57 +00:00
75daa12872
svn merge -r 72903:73200 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Server --> release
...
Missed merge range in release r74199. Josh is an idiot.
2007-11-27 19:48:41 +00:00
fa098e1dee
svn merge -r74202:74317 svn+ssh://svn/svn/linden/branches/Branch_1-18-5-Viewer -> release
2007-11-22 02:21:15 +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
2f6c760624
svn merge -r 73926:74098 svn+ssh://svn/svn/linden/branches/viewer-auth-7
2007-11-20 02:53:43 +00:00
813b140d07
svn merge -r73880:73879 svn+ssh://svn/svn/linden/release. backing out viewer auth merge
2007-11-15 22:39:12 +00:00
291d99bc66
svn merge -r73220:73877 svn+ssh://svn/svn/linden/branches/viewer-auth-6
2007-11-15 19:22:19 +00:00
138bf17c3c
merge of age verification changes from QAR-76 to release; changes were originally made on the age_verification_2007xxxx branches; final changes were QA'd on age_verification_20071112.
2007-11-15 19:10:29 +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
760f2ceb15
svn merge -r 72877:73187 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-4-Viewer --> release
...
Backport patches and translations from RC branch
2007-11-08 18:59:20 +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
1e7917fa89
Committing viewer-auth-server into release svn merge -r72818:72835 svn+ssh://svn/svn/linden/branches/viewer-auth-server-2
2007-11-02 21:26:41 +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
833e8d5c2a
svn merge -r 71403:72356 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Server --> release
...
Backport of fixes from production branch. Merge verified with QAR-41
2007-10-25 22:31:09 +00:00
94bcd2c47d
svn merge -r 71902:71933 svn+ssh://svn.lindenlab.com/svn/linden/branches/expire-group-voice-channels -> release. Reverted 2 changes from the merge that were useless code.
2007-10-22 18:17:47 +00:00
aa8b0cbe69
QAR-25 svn merge -r71797:71803 svn+ssh://svn/svn/linden/branches/logitech_lcd_4
2007-10-17 22:09:27 +00:00
1b550aaec2
EFFECTIVE MERGE: svn merge -r 69928:70806 svn+ssh://svn/svn/linden/branches/maintenance-1 && svn merge -r 70948:70949 svn+ssh://svn/svn/linden/branches/maintenance-1-qa into release
...
ACTUAL MERGE: svn merge -r 71430:71431 svn+ssh://svn/svn/linden/qa/maintenance-1-merge-71429 into release
2007-10-11 00:28:42 +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
4942a7b779
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
2007-10-04 16:31:48 +00:00
75b1cc886d
svn merge -r 70080:70711 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer
...
Pick up last minute patches to the viewer from 1.18.3 final release.
* Final release notes and version numbers
* SL-55123 Mac app icon missing from open source tarball (missed from previous merge?)
* SL-55121 Mac mouse cursors missing from open source tarball (missed from previous merge?)
(I believe the previous merge in this series, r70180, only committed changes inside indra. I've scrubbed the history of that range and don't see any other missing files other than the two assemblies/ patches noted above)
2007-10-02 23:31:38 +00:00
6981b3bc36
svn merge -r 69806:70964 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Server --> release
...
Merge fixes applied directly to 1.18.3 for server deploy, through the sim rollout:
* Listen on the right port for the auditor, don't rely on catch-all
* Fix XMLRPC test object channel
* Various VAT fixes
* Make update_version_files more resilient
* Add class 502/510 for new datacenter
* Teleport metrics fixes
* DB schema update
2007-10-02 22:43:34 +00:00
9b9769b76e
svn merge -r 69597:70080 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.
* SL-55085 Login hangs if optional update is declined.
* SL-55123 Mac app icon missing from open source tarball
* SL-55121 Mac mouse cursors missing from open source tarball
* SL-54978 Remove duplicate code that snuck in during a patch merge
* SL-54633 VWR-2378: Failure to enable the "Update" button in the profile/classifieds tab, after a "Set Location" update
* Release notes/version numbers
2007-09-20 17:51:27 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
e03bb0606a
merge -r62831:64079 branches/maintenance to release
2007-06-21 22:40:22 +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
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
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
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
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
1c909afe39
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
2007-05-02 21:24:47 +00:00
eb3731a3ca
svn merge -r 61099:61168 svn+ssh://svn/svn/linden/branches/release-candidate into release
2007-05-01 21:52:29 +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
0277259455
svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-04-11 17:54:18 +00:00
e1e6ab329f
SL-39721 Run a mini-grid without editing any configuration files. Added start-servers.py and start-client.py. Renamed output executable names to "spaceserver" instead of "newspace", etc. Repaired batch files to use new executable names. Added svn ignores for new executables and intermediate files. Removed llcommon, other linden libraries from explicit linker Additional Dependencies section because this makes IncrediBuild link the libraries twice, slowing it down. Reviewed by Don.
2007-04-06 20:20:41 +00:00
992de40c77
Fixed build for convertj2c.
2007-04-02 23:47:50 +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
204081b8e2
Ported MarkL's fix for SL-38277 to release from message-liberation-5. svn merge -r59784:59785 svn+ssh://svn.lindenlab.com/svn/linden/branches/message-liberation-5 into svn+ssh://svn.lindenlab.com/svn/linden/release.
2007-03-27 20:41:40 +00:00
fceae96eb1
svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release.
2007-03-20 22:21:42 +00:00
5e9e67cb2d
merge -r 59028:59178 maintenance -> release.
2007-03-16 20:39:40 +00:00
1ada34fc0c
merge -r58842:59035 branches/loadstone-names to release
2007-03-16 17:29:45 +00:00
0947e139ed
svn merge -r 58433:58660 svn+ssh://svn/svn/linden/branches/upload-queue into release
2007-03-15 00:54:39 +00:00
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
b36dc36306
svn merge -r 58902:58986 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-09 01:09:20 +00:00
068558f888
merge release@58791 vc8@58828 -> release
...
Adds Dev Studio 2005 (VC8)
Reviewed by Rob
2007-03-07 02:48:44 +00:00
c4059553af
SKIPPED 58849. merge -r 58856:58859 maintenance -> release
2007-03-07 01:16:27 +00:00
14360b815e
merge -r 58641:58711 maintenance -> release
2007-03-06 00:37:09 +00:00
2602986875
merge -r58599:58732 branches/im-email-base32 to release
2007-03-05 22:25:49 +00:00
1d18eb043a
merge -r57991:58444 branches/distribute/user/mute to release
2007-03-05 22:09:52 +00:00
437882ca3b
merge r58577:58578 Branch_1-13-3 to release
2007-03-05 19:08:01 +00:00
4dabd9c047
merge release@58699 beta-1-14-0@58707 -> release
2007-03-02 21:25:50 +00:00
d4462963c6
merge -r 58503:58641 maintenance -> release
2007-03-02 19:11:06 +00:00
b5342e238a
svn merge -r58163:58241 loadstone-sim-standby, reduces database load from standby sims polling the database for a region to run
2007-02-27 17:52:10 +00:00
7dada07dba
svn merge -r 57620:58007 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-02-20 22:02:36 +00:00
73bc0fb42b
merge -r 56779:58057 /branches/selection_management
2007-02-17 03:02:16 +00:00
12ac04231b
merge -r 57761:57967 im-email-session-3, removes database load from IM to email session tracking, introduces new format for email return addresses
2007-02-15 20:24:08 +00:00
4feabe4a9c
svn merge -r 57708:57906 svn+ssh://svn/svn/linden/branches/don/inventory-dataserver-2
2007-02-13 22:02:38 +00:00
d1daa17859
Landing embedded Mozilla support for the Linux Client.
...
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@57782
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxmozilla-r57782base
2007-02-12 17:20:51 +00:00
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
bd48685d34
Fixed a linux build issue when the llhavok suddenly required rtti in order to link.
...
I added a #ifndef hack to v3math.h to eliminate LLString's from the llhavok project.
I also removed lluuid.h's dependency on LLString (using std::string) instead and
then fixed a bunch of bad dependency fallout on a few files around the project
that suddenly lost their hidden access to some fundamental includes.
The important parts were reviewed with James.
2007-02-07 20:33:52 +00:00
d0d4670f49
merge in of error-refactor-3
...
concludes (fixes) SL-31187
pair programmed and reviewed by markl and karen
2007-02-06 00:57:33 +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
934e15973e
merge release@57486 release-candidate@57503
2007-01-31 19:36:32 +00:00
ad94bca0d2
merge -r 56696:57082 Branch_1-13-2
2007-01-24 20:21:23 +00:00
7f50e28b0f
merge -r 56842:57026 maintenance.
2007-01-23 19:12:31 +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
fc664e93e6
Port fix for SL-32157 "PowerPC Mac crashes when crossing regions or teleporting with capabilities turned on" from Branch 1-13-2 r56710 via partial merge of release-candidate -r 56743:56744
2007-01-15 19:49:52 +00:00
d60f16540d
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431
...
This turned up the following "lost" changes:
llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly
llfontgl.cpp (from maintenance r50207) - whitespace only
inventorybridge.cpp (property - non-executable)
skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL
2007-01-04 02:04:29 +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
2b291c2732
svn merge -r 54741:56417 svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew
...
Picking up some interestlist cleanup that passed testing.
2007-01-03 19:16:05 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
James Cook