summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-06-10 14:54:47 -0700
committerGraham Linden <graham@lindenlab.com>2019-06-10 14:54:47 -0700
commitc15baecbfbc9baffdeb6ec53b7e4090470514657 (patch)
tree2b78b844174ff68a8228108730b7136df6d68422 /indra/newview/app_settings
parent6d90dd996ed4381726a2c1666c0ea3af0984c7af (diff)
SL-11370
Modify culling logic to exclude objects correctly in < Mid graphics.
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/mid_graphics.xml2
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/waterF.glsl2
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/mid_graphics.xml b/indra/newview/app_settings/mid_graphics.xml
index a10c02b79f..f989fe7381 100644
--- a/indra/newview/app_settings/mid_graphics.xml
+++ b/indra/newview/app_settings/mid_graphics.xml
@@ -19,7 +19,7 @@
<!--bump okay-->
<RenderObjectBump value="TRUE"/>
<!--NO SHADERS-->
- <RenderReflectionDetail value="0"/>
+ <RenderReflectionDetail value="1"/>
<!--Simple-->
<RenderTerrainDetail value="1"/>
<!--Default for now-->
diff --git a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
index 2235ab12a4..a9161b2a20 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
@@ -153,7 +153,7 @@ void main()
spec = pow(spec, 128.0);
//figure out distortion vector (ripply)
- vec2 distort2 = distort+wavef.xy*refScale/max(dmod*df1, 1.0);
+ vec2 distort2 = distort+wavef.xy*(refScale * 0.01)/max(dmod*df1, 1.0);
vec4 fb = texture2D(screenTex, distort2);