diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-04-26 09:11:52 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-26 09:11:52 -0700 |
| commit | 1688e995eb936c7a38b731fab902dd02aef151d5 (patch) | |
| tree | 06bc0da90c3fbfd42afa697f746177b8b3461adf /indra/llrender/llshadermgr.h | |
| parent | 3834cb6f8ae768a58b3b718eff5ae670a0c299f5 (diff) | |
Provide LLGLSLShader backwards compat so as not to break the appearance utility
Diffstat (limited to 'indra/llrender/llshadermgr.h')
| -rwxr-xr-x | indra/llrender/llshadermgr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index 1c97ab4e60..a33eca4448 100755 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -183,7 +183,7 @@ public: void dumpObjectLog(GLhandleARB ret, BOOL warns = TRUE); BOOL linkProgramObject(GLhandleARB obj, BOOL suppress_errors = FALSE); BOOL validateProgramObject(GLhandleARB obj); - GLhandleARB loadShaderFile(const std::string& filename, S32 & shader_level, GLenum type, boost::unordered_map<std::string, std::string> defines, S32 texture_index_channels = -1); + GLhandleARB loadShaderFile(const std::string& filename, S32 & shader_level, GLenum type, boost::unordered_map<std::string, std::string>* defines = NULL, S32 texture_index_channels = -1); // Implemented in the application to actually point to the shader directory. virtual std::string getShaderDirPrefix(void) = 0; // Pure Virtual |