Age | Commit message (Collapse) | Author |
|
Fix the tying of the deferred prefs UI to the featuretable.
|
|
requirements.
|
|
|
|
SSAO.
|
|
|
|
Backing out this merge that I pushed (prematurely) to the wrong place.
|
|
|
|
|
|
Fix the tying of the deferred prefs UI to the featuretable.
|
|
requirements.
|
|
|
|
SSAO.
|
|
|
|
Checker: UNINIT_CTOR
Function: LLViewerShaderMgr::LLViewerShaderMgr()
File: /indra/newview/llviewershadermgr.cpp
|
|
Self reviewed.
|
|
(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
|
|
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
|
svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
|
|
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
|
|
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
|