Changed: Relabel Moon Position to Moon Angle to clarify that this is the same as Sun Angle just for the moon.

Changed: Maximum shadow resolution to 8K up from 6K and updated their tooltips.
Fixed: Several windlight options falsely disabling when Deferred is turned off.

Added: Goldeelox Littlepaws as Patreon Patron.
Added: Holger Gilruth as Patreon Patron.
Added: Jay as Patreon Patron.
Added: Martin Yeats as Patreon Patron.
Added Nitska Bastet as Patreon Patron.
Added: Samantha marie as Patreon Patron.
Added: Naomii Amore as Patreon Patron.
Added: Tha H as Patreon Patron.
Changed: Holter Rez Patreon amount.

Changed: Use Fixed Environment instead of separate Edit Sky/Water windows to circumvent a random crash.
Changed: Relabeled Sun Position to Sun Angle to make it clearer that Position is the same option as Angle from pre-EEP.

Changed: Swapped around ordering of daycycle preset tabs to start with the lowest on the left and the highest on the right.

Fixed: "Environment" tab in About Land options not working and still showing the old windlight preset selection.
Changed: Layout of "Environment" tab in About Land.

Fixed: Crash when logging in or enabling Deferred while FXAA, SSAO and Shadows are off and Light Softening is on.

# Conflicts:
#	indra/llaudio/llaudiodecodemgr.cpp
#	indra/llcommon/llsdserialize.cpp
#	indra/llcorehttp/_httpservice.cpp
#	indra/llcorehttp/bufferarray.cpp
#	indra/llimage/llimagejpeg.cpp
#	indra/llimage/llpngwrapper.cpp
#	indra/llmath/llvolume.cpp
#	indra/llmessage/llcorehttputil.cpp
#	indra/llmessage/llhttpnode.cpp
#	indra/llrender/llgl.cpp
#	indra/llwindow/lldxhardware.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llsecapi.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/pipeline.cpp

Changed: Label the separator lines in Preferences - Sound and Camera like those found in Preferences - Display.

Changed: Pie Menu warning notification to better reflect that Pie Menus have changed but might still crash.

Removed: Several legacy debug settings that can no longer be found in Preferences but need to be enabled to make Deferred work. Fixes Deferred failing after graphics initialization fail.

Fixed: Radgiobuttons giving out integers as LLSD resulting in settings using these being saved as strings.

Added: More preset resolutions to snapshot window.
Added: Warning when enabling snapshot resolutions above 4K.
Changed: Disable all snapshot resolutions above 4K unless the user specifically enables them and sees the warning.

Fixed: Cinematic Camera not being subject to camera smoothing.
Fixed: Camera freaking out when Cinematic Camera and Bone Camera are enabled at the same time.
Fixed: Bone Camera not being subject to the currently selected preset's Focus Offset.