| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 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-11-07 | QAR-992 Merging revisions 101012-101170,101686-101687 of ↵ | Mark Palange | |
| svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release | |||
| 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-06-27 | QAR-669 1.20 Viewer RC11 | Steven Bennetts | |
| QAR-648 1.20 Viewer RC10 merge Branch_1-20-Viewer-2 -r 88724:90511 -> release | |||
| 2008-06-26 | QAR-628 merge string-cleanup-5 -r 90476:90508 -> release | Steven Bennetts | |
| dataserver-is-deprecated | |||
| 2008-06-06 | QAR-650 - Viewer RC 9 merge -> release (post cmake) | Steven Bennetts | |
| merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release | |||
| 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-04-28 | merge release-QAR-499 Viewer 1.20 RC 3 | Steven Bennetts | |
| merge release-QAR-508 Viewer 1.20 RC 4 merge Branch_1-20-Viewer -r 85278 : 85828 -> release | |||
| 2008-03-20 | merge release@82383 viewer-cleanup2-7-merge@82828 | Steven Bennetts | |
| QAR-369 | |||
| 2008-03-15 | reverting premature commit at 82410. | Steven Bennetts | |
| 2008-03-14 | [NOTE: This was an erroneous commit, and was reverted in the next revision] | Mark Palange | |
| QAR-369 - viewer-cleanup2-7 81916 merged into 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-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-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-07-03 | Fixed VS8 project files for sse-skinning merge. | James Cook | |
| 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-05-02 | svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵ | Don Kjer | |
| release | |||
| 2007-04-11 | svn merge -r 59968:60342 ↵ | Josh Bell | |
| svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release | |||
| 2007-03-31 | svn merge -r 59364:59813 ↵ | Josh Bell | |
| svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release | |||
| 2007-03-22 | I broke linux and mac builds, reverting the changes from 59596 | Kelly Washington | |
| 2007-03-22 | Couple steps closer to compiling on VC8, new boost headers and libs. | Kelly Washington | |
| 2007-03-02 | merge release@58699 beta-1-14-0@58707 -> release | Steven Bennetts | |
| 2007-01-03 | corrected, removed, and updated comments throughout the code to be more ↵ | Aaron Brashears | |
| useful. no code changes. SL-13762 | |||
| 2007-01-02 | Print done when done. | James Cook | |
 |
index : viewer.git | |
| Megapahit's fork of the Second Life viewer. | Erik Kundiman |
| summaryrefslogtreecommitdiff |