Age | Commit message (Collapse) | Author | |
---|---|---|---|
2019-01-14 | SL-10291 Replace apr_mutex with standard C++11 functionality | andreykproductengine | |
2018-01-23 | MAINT-8047 [Mac] Incorrect VFS (cache) creation time is shown in "help>about SL" | maxim_productengine | |
2016-11-14 | MAINT-6920 More information in About Second Life floater | andreykproductengine | |
2015-11-10 | remove execute permission from many files that should not have it | Oz Linden | |
2014-03-12 | merge with release | Richard Linden | |
2014-02-14 | More memory cleanup of containers after DeletePairedPointer() usage. | simon | |
2014-02-14 | [MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown | Baker Linden | |
- Added clear() after DeletePointer() call to hopfully fix this... | |||
2013-08-09 | second phase summer cleaning | Richard Linden | |
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc. | |||
2013-03-29 | Update Mac and Windows breakpad builds to latest | Graham Madarasz | |
2011-05-12 | merge | Dave Parks | |
2011-04-27 | Fix for mac compile error in VWR-25608 fix. | brad kittenbrink | |
2011-04-26 | FIX VWR-25608 error on shutdow due to buffer overflow in LLVFS::audit | brad kittenbrink | |
2010-10-13 | correct licenses (fix problem with license change merge) | Oz Linden | |
2010-09-22 | Merge | Matthew Breindel (Falcon) | |
2010-09-22 | Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching ↵ | Dave Parks | |
type back into tools floater. | |||
2010-09-21 | Fix for build failures - disabling tcmalloc for now | Brad Payne (Vir Linden) | |
2010-08-13 | Change license from GPL to LGPL (version 2.1) | Oz Linden | |
2010-06-10 | Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of ↵ | Dave Parks | |
merge fixes. | |||
2009-11-02 | Sync up with render-pipeline-7 ignore-dead-branch | David Parks | |
2009-06-21 | merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 | Steven Bennetts | |
ignore-dead-branch | |||
2009-05-04 | QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3 | Adam Moss | |
svn merge -r118927:118939 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476 this is a composite of... svn merge -r115088:118182 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23 conflicts resolved: C doc/contributions.txt C indra/llaudio/audioengine.cpp C indra/newview/CMakeLists.txt C indra/newview/llfloaterlandholdings.cpp C indra/newview/llpaneldirbrowser.cpp C indra/newview/llpanelgrouplandmoney.cpp C indra/newview/llpreviewscript.cpp C indra/newview/llviewermenu.cpp C indra/newview/skins/default/xui/en-us/notifications.xml and... svn merge -r116937:118673 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 minor-to-trivial conflicts resolved: C indra/llcommon/llversionserver.h C indra/newsim/llrezdata.cpp C indra/newsim/llstate.cpp C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql | |||
2009-04-16 | svn merge -r117314:117337 | Adam Moss | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1 QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge | |||
2009-03-20 | svn merge -r113004:115000 ↵ | Dave Simmons | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 Merge latest 1.26 into trunk | |||
2009-02-18 | Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 ↵ | Brad Kittenbrink | |
(maint-render-9) and QAR-1236 (dll-msvcrt-2) svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833 | |||
2009-01-08 | Result of svn merge -r107256:107258 ↵ | Aaron Brashears | |
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | |||
2008-10-07 | svn merge -r98039:98711 ↵ | Kyle Ambroff | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release Merging various security fixes from Branch_1-24-Server. Related to RequestXfer exploit: * DEV-21706 (SEC-188): llParticleSystem can be used to obtain asset id. * DEV-21767: Migrate RequestXfer to TCP-only * DEV-21765: Fix RequestXfer traversal exploit * DEV-21775: LLXferManager::processFileRequest() still has file vulnerabilities Various fixes: * fix for VFS memory corruption in llvfs. * Bump server version to 1.24.9. Landstore fixes: * Passing locale to fulfill-order-item from region reservation fulfillment. | |||
2008-08-28 | merge viewer/viewer_1-21 94170-94770 -> release | Steven Bennetts | |
merge viewer/viewer_1-21-0 94830-95157 -> release Includes: QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki! QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme | |||
2008-06-26 | QAR-628 merge string-cleanup-5 -r 90476:90508 -> release | Steven Bennetts | |
dataserver-is-deprecated | |||
2008-05-14 | Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge . | Eric Tulla | |
Passed QA as part of QAR-491. | |||
2008-05-08 | QAR-570 maint-render-4 merge | Steven Bennetts | |
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated. | |||
2007-10-04 | Result of svn merge -r71162:71205 ↵ | Aaron Brashears | |
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 | Result of svn merge -r70873:71086 ↵ | Aaron Brashears | |
svn+ssh://svn/svn/linden/branches/enable-exceptions into release. | |||
2007-08-21 | EFFECTIVE MERGE: svn merge -r 66133:68118 ↵ | Christian Goetze | |
svn+ssh://svn/svn/linden/branches/maintenance into release Actual action: branched maintenance-r68118, merged in release, then copied result into release | |||
2007-07-20 | svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into ↵ | Don Kjer | |
release * WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269 | |||
2007-06-21 | merge -r62831:64079 branches/maintenance to release | Kelly Washington | |
2007-05-02 | svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵ | Don Kjer | |
release | |||
2007-03-02 | merge release@58699 beta-1-14-0@58707 -> release | Steven Bennetts | |
2007-02-09 | Result of svn merge -r57350:57790 ↵ | Aaron Brashears | |
svn+ssh://svn/svn/linden/branches/os-patches.001 into release. | |||
2007-02-05 | merge -r 57111:57464 maintenance. | Steven Bennetts | |
2007-02-02 | Result of svn merge -r57264:57370 ↵ | Aaron Brashears | |
svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release. | |||
2007-01-26 | Updated vfsextract to include the correct extension for .tga, .wav, and .lla ↵ | Steven Bennetts | |
files. | |||
2007-01-17 | merge release@56803 release-candidate@56833 | Steven Bennetts | |
2007-01-02 | Print done when done. | James Cook | |