# Conflicts:
#	indra/newview/pipeline.cpp

following promotion of DRTVWR-497

These logs were not logging for very long due to supressed logging system, no point showing them now

Depends onto SL-13979 for proper logging

LLSingleton depends onto logging system, having logging system be based on LLSingleton causes crashes and deadlocks

Merge 6.4.9 into DRTVWR-497

SL-13522 remove injected character lights to improve alpha lighting in edit mode

Approved-by: Michael Pohoreski

# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloaterconversationpreview.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/llmeshrepository.h
#	indra/newview/llvoicevivox.cpp

following promotion of DRTVWR-503

Character lights injected during render pass while in character edit mode
(i.e. mSpecialRenderMode == 3) were causing discrepencies between deferred
(ALM) and forward alpha blend lighting.

Notifications were cleaned up by this point and were pulling in LLUI

Contribution from Ansariel Hiller

DRTVWR-4976 Misc shader cleanup.

Approved-by: Michael Pohoreski

Removed some potential div-by-0 NaNs and a mangled clamp.

SL-13768 revisited, remove moon glow from ALM (deferred) path as well

Approved-by: Michael Pohoreski

SL-13705 - language list defaults to the standard supported set of FR, ES, IT, PT, JA, DE. '--lang all' will also use this list

Revert "SL-13768 Remove glow from moon when sun is down due to it using the sun glow setting (pull request #297)"

Revert "SL-13768 Remove glow from moon when sun is down due to it using the sun glow setting (pull request #297)"

SL-13705 - lock all columns except C in the excel file (apparently google sheets does not respect this setting on import)

SL-13768 Remove glow from moon when sun is down due to it using the sun glow setting

SL-13465 B