Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/llimprocessing.cpp
# indra/newview/llviewerjoystick.cpp
# indra/newview/llviewermenufile.cpp
|
|
|
|
following promotion of DRTVWR-501
|
|
|
|
Approved-by: Dave Houlton
|
|
|
|
|
|
|
|
|
|
|
|
Merge master v6.4.7 to LMR#4 DRTVWR-497
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/cmake/DirectX.cmake
# indra/newview/llviewerparcelmedia.cpp
# indra/newview/viewer_manifest.py
|
|
to reflect previous commit and use correct pool size
|
|
|
|
|
|
following promotion of DRTVWR-476
|
|
This reverts commit bf999f2f84dd26844c60d682f563f982a55e8ee8 due to revert of updater, this will be moved to separate 'epic' instead
|
|
|
|
This fails at teamcity due to missing LLTrans, but builds locally without issues. Reverting to not hold D501
|
|
SL-13521 Add avatar appearance lighting to deferred lighting path
Approved-by: Andrey Kleshchev
Approved-by: Michael Pohoreski
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This reverts commit 31d9930a0ff7da5a6312a8f47037052cd2d06bdb.
|
|
|
|
SL-13406 fix an end-scope enable error in glow rendering
|
|
|
|
|
|
being empty as well as the status flag condition
|
|
|
|
|
|
|