Merge branch 'merge-1.21.6' into rebranding

Conflicts:
	linden/indra/newview/installers/windows/installer_template.nsi
	linden/indra/newview/llappviewer.cpp

1 files changed, 6 insertions, 0 deletions

diff --git a/linden/indra/newview/featuretable.txt b/linden/indra/newview/featuretable.txt
index 0a12958..b227043 100644
--- a/linden/indra/newview/featuretable.txt
+++ b/linden/indra/newview/featuretable.txt
@@ -303,6 +303,9 @@ list Intel_G33
 RenderTerrainDetail                     1       0
 RenderVBOEnable                         1       0
 
+list Intel_G45
+WindLightUseAtmosShaders                0       0
+
 list Intel_Bear_Lake    
 RenderTerrainDetail                     1       0
 RenderVBOEnable                         1       0
@@ -315,6 +318,9 @@ list Intel_Brookdale
 RenderTerrainDetail                     1       0
 RenderVBOEnable                         1       0
 
+list Intel_Eaglelake
+WindLightUseAtmosShaders        0       0
+
 list Intel_Montara
 RenderTerrainDetail                     1       0
 RenderVBOEnable                         1       0