diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-10-03 18:04:27 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-10-03 18:04:27 -0400 |
| commit | 4dccf30bf318649c7b371355fd34cde6c143e867 (patch) | |
| tree | 4acbdefe0bb187a817583e835112f4317e11d596 /indra/llrender/llpostprocess.h | |
| parent | bd18f3c097304504c398df02613229a64f7eac81 (diff) | |
| parent | f7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff) | |
merge changes for 3.6.7-release
Diffstat (limited to 'indra/llrender/llpostprocess.h')
| -rwxr-xr-x | indra/llrender/llpostprocess.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llrender/llpostprocess.h b/indra/llrender/llpostprocess.h index e19de44c60..ce17b6693d 100755 --- a/indra/llrender/llpostprocess.h +++ b/indra/llrender/llpostprocess.h @@ -31,6 +31,7 @@ #include <fstream> #include "llgl.h" #include "llglheaders.h" +#include "llstaticstringtable.h" class LLPostProcess { @@ -44,7 +45,7 @@ public: } QuadType; /// GLSL Shader Encapsulation Struct - typedef std::map<const char *, GLuint> glslUniforms; + typedef LLStaticStringTable<GLuint> glslUniforms; struct PostProcessTweaks : public LLSD { inline PostProcessTweaks() : LLSD(LLSD::emptyMap()) |