diff --git a/indra/newview/app_settings/shaders/class1/environment/terrainV.glsl b/indra/newview/app_settings/shaders/class1/environment/terrainV.glsl index d09c5f9247c174e8d13f7ef2e4721fbefaf31476..4d6f0c67a53587f8fba0aec1ad8027b6ea789e2d 100644 --- a/indra/newview/app_settings/shaders/class1/environment/terrainV.glsl +++ b/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; diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp index df06ad31e6d1919cdc3c1495541cce801bd9dff8..93168901565b52574e6f23b18f1e9f8fd45bddeb 100644 --- a/indra/newview/lldrawpoolwater.cpp +++ b/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"); diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index c131cb886f4b2f1d202e9289ff6635890f8694cd..54ec238fdefbbd4b0291f548685b633e81c71cb9 100644 --- a/indra/newview/llvosky.cpp +++ b/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;