summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-06-22 16:21:53 -0500
committerDave Parks <davep@lindenlab.com>2011-06-22 16:21:53 -0500
commit1e061e56334cf9343909656c8d48830430047353 (patch)
treeb5c6bb3d9fd1fdb935ba03dac2bc6b3cf20e9220
parentd4103101fef0b12256f97839eaebc292d06f5b74 (diff)
SH-1848 Integrate changeset to fix typo in shader name preventing shadows being enabled while anti-aliasing is on on platforms where filenames are case sensitive.
-rw-r--r--indra/newview/llviewershadermgr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index da4d0548d0..0e3a0ef507 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -1209,7 +1209,7 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
{
if (multisample)
{
- fragment = "deferred/sunlightSSAOMSF.glsl";
+ fragment = "deferred/sunLightSSAOMSF.glsl";
}
else
{
@@ -1220,7 +1220,7 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
{
if (multisample)
{
- fragment = "deferred/sunlightMSF.glsl";
+ fragment = "deferred/sunLightMSF.glsl";
}
else
{