Age | Commit message (Collapse) | Author |
|
|
|
# Conflicts:
# indra/llmath/llquaternion.h
# indra/newview/lldrawpoolwater.cpp
# indra/newview/lljoystickbutton.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/textures/textures.xml
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/pipeline.cpp
|
|
|
|
following promotion of DRTVWR-440
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Camera preset, not as separate setting
|
|
|
|
|
|
|
|
water Fresnel
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
to compile/link
|
|
compile/link
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Fix light falloff being corrupted when editing value via build floater spinner
Approved-by: Dave Houlton
|
|
Fix editing light color corrupting intensity and color values
Approved-by: Dave Houlton
|
|
|
|
|
|
|
|
|