Age | Commit message (Collapse) | Author | |
---|---|---|---|
2013-03-29 | Update Mac and Windows breakpad builds to latest | Graham Madarasz | |
2012-07-11 | Pull in viewer-development because it's painful. Merge with runitai's help. | simon@Simon-PC.lindenlab.com | |
2012-06-04 | merge | Brad Payne (Vir Linden) | |
2012-02-07 | EXP-1181 WIP as a designer I would like to specify default floater positions ↵ | Richard Linden | |
using realtive coordinates refactored LLCoord code to be templated, ultimately to support arbitrary conversions | |||
2011-12-19 | SH-2789 WIP - various fixes to force 16-byte alignment | Brad Payne (Vir Linden) | |
2011-12-15 | SH-2789 WIP - build without tcmalloc, force alignment in various places | Brad Payne (Vir Linden) | |
2010-08-13 | Change license from GPL to LGPL (version 2.1) | Oz Linden | |
2009-11-30 | Linker optimization - use "extern template" for commonly regenerated templates | James Cook | |
Also replaced many duplicate calls to LLViewerCamera::getInstance() with local pointer. Reviewed with Ambroff | |||
2009-11-29 | Revert extern template link optimization until I can build/test on PC | James Cook | |
2009-11-28 | Use extern template for common singletons to reduce code bloat/link time. | James Cook | |
2009-11-06 | merge QAR-1829: texture pipeline branch in viewer-2.0.0.3 | Xiaohong Bao | |
2009-09-22 | Merging render-pipeline-6-qa-2 into viewer-2 | David Parks | |
Self reviewed. | |||
2009-06-23 | Fixed a bunch of missing includes and forward declares. I was trying to ↵ | James Cook | |
benchmark with precompiled headers off, but we'll have to do a bunch more cleanup before it's possible to disable that feature cleanly. Not reviewed. | |||
2009-06-21 | merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 | Steven Bennetts | |
ignore-dead-branch | |||
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-12-15 | svn merge -r105329:105903 ↵ | Melinda Green | |
svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge Resolving QAR-1051 Merge featurettes batch #4 | |||
2008-06-30 | Merging in file-move-merge ( QAR-649 ) | Eric Tulla | |
Result of "svn merge -r 90669:90786 $tulla/file-move-merge ." Be careful of future merges involving changes to any of these moved files as SVN usually does the wrong thing: newview/llglslshader.* -> llrender/llglslshader.*, llrender/llshadermgr.*, newview/llviewershadermgr.* (gets split into 3 separate files) newview/llpostprocess.* -> llrender/llpostprocess.* newview/llrendersphere.* -> llrender/llrendersphere.* newview/llcubemap.* -> llrender/llcubemap.* llwindow/llgl.* -> llrender/llgl.* llwindow/llglstates.h -> llrender/llglstates.h llwindow/llgltypes.h -> llrender/llgltypes.h llwindow/llglheaders.h -> llrender/llglheaders.h | |||
2008-04-01 | merge release@83343 skinning-1-merge@83714 -> release | Steven Bennetts | |
QAR-424 | |||
2008-02-27 | Merge of windlight into release (QAR-286). This includes all changes in | Brad Kittenbrink | |
windlight14 which have passed QA (up through r79932). svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620 | |||
2007-11-07 | merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079 | Steven Bennetts | |
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-09-14 | EFFECTIVE MERGE: svn merge -r 68118:68999 ↵ | Don Kjer | |
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-04-11 | svn merge -r 59968:60342 ↵ | Josh Bell | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release | |||
2007-03-02 | merge release@58699 beta-1-14-0@58707 -> release | Steven Bennetts | |
2007-01-02 | Print done when done. | James Cook | |