Age | Commit message (Collapse) | Author | |
---|---|---|---|
2010-07-19 | Merge with dessie/viewer-release | Leyla Farazha | |
2010-07-08 | EXT-8287 Add some null checks and asserts around drawable faces. | Dave Parks | |
2010-03-08 | Trivial header file cleanup | James Cook | |
2010-02-02 | Remove a couple of header deps on llprimitive.h for faster buildy goodness. | Tofu Linden | |
2009-10-01 | svn merge -r 134922:134973 ↵ | Monroe Williams | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 Merging branches/media-on-a-prim/moap-7 down to viewer-2.0. | |||
2009-09-22 | Merging render-pipeline-6-qa-2 into viewer-2 | David Parks | |
Self reviewed. | |||
2009-08-24 | merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3 | Richard Nelson | |
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684 improved text editor (handles multiple fonts simultaneously as well as inline widgets) | |||
2009-07-10 | merge QAR-1579: texture-cleanup-1. | Xiaohong Bao | |
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-08-12 | QAR-767 Combined maint-render-7 and maint-viewer-9 merge | Steven Bennetts | |
merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated | |||
2008-04-03 | 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 | Steven Bennetts | |
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release (Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release) | |||
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-07-02 | svn merge -r 62595:62596 and 62598:63308 sse-skinning-3 for faster software ↵ | James Cook | |
avatar rendering. Visual Studio 2005 project file fixed pending. | |||
2007-07-02 | svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into ↵ | Don Kjer | |
release | |||
2007-06-21 | merge -r62831:64079 branches/maintenance to release | Kelly Washington | |
2007-06-04 | svn merge -r 62602:62831 ↵ | Josh Bell | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release | |||
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 | |