Contribution

Depends onto SL-13979 for proper logging

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

Pulled in and updated Rider's changes

following promotion of DRTVWR-482

following promotion of DRTVWR-497

Due to conflicts picked up ptolemy's fix manually

Merge 6.4.9 into DRTVWR-497

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

Approved-by: Michael Pohoreski

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.

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

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-13768 Remove glow from moon when sun is down due to it using the sun glow setting

SL-13465 B

SL-13830 Remade vivox shutdown to terminate when it is told to shutdown instead of when viewer is quiting

Got into D503 by accident

LN (EKU_TLS) is more likely to be present thus should be checked first

This reverts commit 92499ce1.

# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llinventorypanel.h