| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2013-06-21 | Automated merge with file:///F:%5Cviewer-bear | Dave Parks | |
| 2013-06-20 | Automated merge with http://bitbucket.org/lindenlab/viewer-release | Dave Parks | |
| 2013-06-03 | NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent ↵ | Dave Parks | |
| calculator instead of binormal calculator, convert binormal centric code to tangent centric) | |||
| 2013-05-09 | Merge downstream code and viewer-beta | simon | |
| 2013-05-09 | Merge viewer-beta | simon | |
| 2013-04-25 | Merge 3.5.1 into Materials | Graham Madarasz | |
| 2013-04-17 | NORSPEC-90 Alpha pool hookups for materials. | Dave Parks | |
| 2013-03-29 | NORSPEC-66 Hook up material parameters to rigged attachments. | Dave Parks | |
| 2013-03-29 | Update Mac and Windows breakpad builds to latest | Graham Madarasz | |
| 2013-02-21 | Merge viewer-cat and resolve conflict with alternate self | Graham Madarasz (Graham Linden) | |
| 2012-12-05 | MAINT-2040 Fix for rigged meshes sometimes not updating properly with color ↵ | Dave Parks | |
| changes. | |||
| 2011-09-23 | SH-2244 Vertex buffer cleanup, fix for bad vertices in rigged attachments, ↵ | Dave Parks | |
| added "RenderUseVAO" debug setting to control whether or not to use VAO's in non-core GL profiles. | |||
| 2011-08-10 | SH-2238, SH-2223, SH-SH-2242 glVertexAttrib throughout main render pipeline ↵ | Dave Parks | |
| complete, preview renders and debug displays still pending. Also fixed a render glitch and a crash (JIRAs listed). | |||
| 2010-12-01 | Automated merge up from viewer-development | Loren Shih | |
| 2010-10-13 | correct licenses (fix problem with license change merge) | Oz Linden | |
| 2010-10-10 | VWR-21967 There's lots of ::renderForSelect() code that we don't need any more. | Tofu Linden | |
| VWR-22088 Remove underlying ::renderForSelect() code (render-pipeline) | |||
| 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-24 | Backed out changeset c3d41f18ce2b | Tofu Linden | |
| back-out the back-out for this branch. yay. | |||
| 2010-08-24 | Backed out changeset a62bf7c0af21 | Tofu Linden | |
| Backing out this merge that I pushed (prematurely) to the wrong place. | |||
| 2010-08-24 | merge heads. whew. | Tofu Linden | |
| 2010-08-19 | Integrate SIMD API from oreh/server-trunk-oreh | Dave Parks | |
| 2010-08-13 | Change license from GPL to LGPL (version 2.1) | Oz Linden | |
| 2010-06-14 | Builds with LLConvexDecompInter as a static lib. | Dave Parks | |
| 2010-06-10 | Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of ↵ | Dave Parks | |
| merge fixes. | |||
| 2010-05-10 | Fix for wierd triangle shadow bug and fix for ATI hating deferred rendering. | Dave Parks | |
| 2010-05-04 | Deferred pipeline integration of rigged attachments and cleanup. | Dave Parks | |
| 2010-05-02 | Rigged glow. | Dave Parks | |
| 2010-05-01 | Fullbright shiny skinned. | Dave Parks | |
| 2010-05-01 | Fullbrigt skinned and fix for silly crash from not removing face references. | Dave Parks | |
| 2010-05-01 | Rigged attachment integration WIP. | Dave Parks | |
| 2010-04-22 | Deferred shading for rigged attachments. | Dave Parks | |
| 2010-04-19 | Remove foot shadows, renaming foot shadow pass to impostor pass. | Dave Parks | |
| (transplanted from 9b6ce276fa8d72109208e84c65890b0d06dba5db) | |||
| 2010-04-19 | Remove foot shadows, renaming foot shadow pass to impostor pass. | Dave Parks | |
| 2010-04-06 | Rigged attachments (almost works). | Dave Parks | |
| 2010-01-29 | CID-350 | Tofu Linden | |
| Checker: UNINIT_CTOR Function: LLDrawPoolAvatar::LLDrawPoolAvatar() File: /indra/newview/lldrawpoolavatar.cpp not a bug, just a dead member... | |||
| 2009-07-10 | merge QAR-1579: texture-cleanup-1. | Xiaohong Bao | |
| 2009-03-05 | Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272). | Eric Tulla | |
| No conflicts in the merge. Result of: svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 . | |||
| 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-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-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-03-02 | merge release@58699 beta-1-14-0@58707 -> release | Steven Bennetts | |
| 2007-01-02 | Print done when done. | James Cook | |
 |
index : viewer.git | |
| Megapahit's fork of the Second Life viewer. | Erik Kundiman |
| summaryrefslogtreecommitdiff |