Merge 6ish

indra/newview/app_settings/shaders/class1/environment/terrainV.glsl

@@ -71,7 +71,7 @@ void main()
 	/// Potentially better without it for water.
 	pos /= pos.w;
 
-	vec4 color = calcLighting(pos.xyz, norm, vec4(1,1,1,1), vec4(0));
+	vec4 color = calcLighting(pos.xyz, norm, vec4(1), vec4(0));
 	
 	vertex_color = color;
 

indra/newview/lldrawpoolwater.cpp

@@ -48,6 +48,10 @@
 #include "llviewershadermgr.h"
 #include "llwaterparammanager.h"
 
+#if LL_WINDOWS
+#pragma optimize("", off)
+#endif
+
 const LLUUID TRANSPARENT_WATER_TEXTURE("2bfd3884-7e27-69b9-ba3a-3e673f680004");
 const LLUUID OPAQUE_WATER_TEXTURE("43c32285-d658-1793-c123-bf86315de055");
 

indra/newview/llvosky.cpp

@@ -54,6 +54,10 @@
 #undef min
 #undef max
 
+#if LL_WINDOWS
+#pragma optimize("", off)
+#endif
+
 static const S32 NUM_TILES_X = 8;
 static const S32 NUM_TILES_Y = 4;
 static const S32 NUM_TILES = NUM_TILES_X * NUM_TILES_Y;