summaryrefslogtreecommitdiff
path: root/indra/llrender/llshadermgr.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-04-02 14:32:59 -0700
committerGraham Linden <graham@lindenlab.com>2019-04-02 14:32:59 -0700
commitb8115d43c95504afa0a15a091e3d1ab389c71366 (patch)
tree9604a0f9ab1c65894bca1239264c3e1842acd58b /indra/llrender/llshadermgr.cpp
parentac2fc3029f3b9b6ba182949c29a7919f2f87eb02 (diff)
parent5cf18cb867be567bf921f0b94a78fd822e4112ad (diff)
Merge 6.1.2
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
-rw-r--r--indra/llrender/llshadermgr.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index e721ad93fa..643c368870 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -537,8 +537,6 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
}
}
- LL_DEBUGS("ShaderLoading") << "Loading shader file: " << filename << " class " << shader_level << LL_ENDL;
-
if (filename.empty())
{
return 0;
@@ -558,7 +556,7 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
fname << getShaderDirPrefix();
fname << gpu_class << "/" << filename;
- LL_DEBUGS("ShaderLoading") << "Looking in " << fname.str() << LL_ENDL;
+
file = LLFile::fopen(fname.str(), "r"); /* Flawfinder: ignore */
if (file)
{