Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
SL-17274: Stub for PBR DrawPool and shader
Approved-by: Euclid Linden
Approved-by: Dave Parks
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/llappviewer.h
|
|
overhead from reflection map renders. Add parallax correction and support for multiple reflection maps.
|
|
|
|
|
|
|
|
# Conflicts:
# indra/llcommon/llsdutil.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolwater.cpp
|
|
|
|
attachments rendering to depth buffer)
|
|
|
|
|
|
|
|
removal of glow-only rigged meshes from depth buffer.
|
|
|
|
|
|
builds.
|
|
before first login
|
|
|
|
|
|
|
|
Due to changes in SL-16715
|
|
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
|
|
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llfloatereditextdaycycle.cpp
|
|
end-to-end to avoid confusion
|
|
|
|
|
|
|
|
+ post merge conflict fix
|
|
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
|
|
|
|
DRTVWR-546
|
|
rigged meshes.
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
# indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
|
|
|
|
support to highlight transparent).
|
|
(decruftify settings, compatibility pass).
|
|
textures
|