summaryrefslogtreecommitdiff
path: root/indra/newview/llviewershadermgr.cpp
AgeCommit message (Collapse)Author
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-05-04EXT-7168Tofu Linden
Fix the tying of the deferred prefs UI to the featuretable.
2010-03-20Tweak detail settings and make graphics preferences widget enabling respect ↵Dave Parks
requirements.
2010-03-19Make gcc happyDave Parks
2010-03-19RenderDeferredSSAO works as an independent setting -- decoupled shadows from ↵Dave Parks
SSAO.
2010-03-19Replace RenderDeferredShadow/RenderDeferredSunShadow with RenderShadowDetailDave Parks
2010-01-27CID-348Tofu Linden
Checker: UNINIT_CTOR Function: LLViewerShaderMgr::LLViewerShaderMgr() File: /indra/newview/llviewershadermgr.cpp
2009-09-22Merging render-pipeline-6-qa-2 into viewer-2David Parks
Self reviewed.
2009-02-18Merge 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-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-11-07QAR-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-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated
2008-06-30Merging 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 20:11:57 +0000