diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-04 13:15:43 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-04 13:15:43 -0500 |
| commit | a373a7442c244712ab17d793072699ef82684816 (patch) | |
| tree | 2ed20e24993c4bfbb4f943ed7794fcd06eeb8a23 /indra/newview/llmaniptranslate.cpp | |
| parent | b0c255f4e6141246f3575cb3d5b671af19966de9 (diff) | |
| parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) | |
merge changes for 3.7.2-release
Diffstat (limited to 'indra/newview/llmaniptranslate.cpp')
| -rwxr-xr-x | indra/newview/llmaniptranslate.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp index b62db70ec8..06bf294417 100755 --- a/indra/newview/llmaniptranslate.cpp +++ b/indra/newview/llmaniptranslate.cpp @@ -1681,7 +1681,8 @@ void LLManipTranslate::highlightIntersection(LLVector3 normal, gGL.getModelviewMatrix().inverse().mult_vec_matrix(plane); - gClipProgram.uniform4fv("clip_plane", 1, plane.v); + static LLStaticHashedString sClipPlane("clip_plane"); + gClipProgram.uniform4fv(sClipPlane, 1, plane.v); BOOL particles = gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_PARTICLES); BOOL clouds = gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_CLOUDS); |