Age | Commit message (Collapse) | Author |
|
|
|
# Conflicts:
# indra/newview/llvocache.cpp
|
|
|
|
|
|
|
|
|
|
Removed some potential div-by-0 NaNs and a mangled clamp.
|
|
|
|
|
|
|
|
|
|
|
|
This reverts commit 92499ce1b43fd60ce7aad71d12f9eef0cef04f7f.
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
|
|
original fall-off.
Had to find a balance in the sunlight intensity calculation that behaves correctly for
both these issues.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/cmake/DirectX.cmake
# indra/newview/llviewerparcelmedia.cpp
# indra/newview/viewer_manifest.py
|
|
to reflect previous commit and use correct pool size
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ALM ON and OFF
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/llcommon/llkeybind.cpp
# indra/llcommon/llkeybind.h
|
|
|
|
lighting
|
|
SL-13084: Fix clouds flipped along East/West axis to match texture preview Cloud Image and direction to match Cloud Scroll
SL-13804: Fix clouds flipped along East/West axis to match texture preview Cloud Image and direction to match Cloud Scroll
SL-13084: Fix inverted cloud scroll with ALM is off
SL-13084: Move texture coords section to top in class2/windlight/cloudsV to match class1/deffered/cloudsV
SL-13084: Add references to other common files
|
|
|
|
|
|
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/viewer_manifest.py
|