Age | Commit message (Collapse) | Author | |
---|---|---|---|
2010-03-12 | EXT-6276 Fix for UI going all wonky. | Dave Parks | |
2010-03-12 | Bizarrely hacky fix for EXT-6276 (#if LL_DARWIN out copyFromPrimarySubstring) | Dave Parks | |
General gl state cleanup in llui. Make llrender more gGL.begin/end friendly. | |||
2010-03-11 | EXT-6276 Put in some gl flush calls to texture state functions. | Dave Parks | |
2010-03-11 | EXT-6276 Put in some gl flush calls to register combiner functions (why ↵ | Dave Parks | |
these are being used for UI now is beyond me) | |||
2010-02-13 | a better fix for the blend-factor init problem. I think. | Tofu Linden | |
2010-02-08 | Fix for blend func being screwed up at init. | Dave Parks | |
Fix for avatar appearance editor drawing hair in the background. | |||
2010-02-06 | Fix for bad GL blend function caching. | Dave Parks | |
2010-02-23 | merge | Palmer Truelson | |
2010-02-23 | Turning back on Davep's ui optimizations. Backed out changeset 6c161782dba3 | Palmer Truelson | |
2010-02-12 | merge | Palmer Truelson | |
2010-02-12 | Backed out davep's UI optimization. changeset 3134cb7bb181 | Palmer Truelson | |
2010-02-04 | merge | Dave Parks | |
2010-02-04 | No more matrix ops in UI code. | Dave Parks | |
2010-02-03 | CID-292 | Tofu Linden | |
Checker: UNINIT_CTOR Function: LLRender::LLRender() File: /indra/llrender/llrender.cpp | |||
2010-01-11 | EXT-3784 Fix for first menu item going blank when highlighted on ATI cards. | Runitai | |
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-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-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-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-13 | svn merge -r106055-107012 ↵ | Mark Palange | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/ merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't. | |||
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-23 | QAR-1142 merging 1.22 RC0-RC4 changes. | Mark Palange | |
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge | |||
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-09-12 | QAR-855 Viewer 1.21 RC 2 | Steven Bennetts | |
merge viewer_1-21 94770-96059 -> release | |||
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-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-06 | QAR-650 - Viewer RC 9 merge -> release (post cmake) | Steven Bennetts | |
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release |