diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-07 16:06:13 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-07 16:06:13 +0100 |
commit | 6a3c28395343e8ac767c9d66198762fc6e9197c5 (patch) | |
tree | 956e0b6c3c431202ece8da61d0d7961d3fcab7d5 /indra/newview/pipeline.cpp | |
parent | 429beb3049dd0bac811de2faf4501f2fab597d2f (diff) |
merge fix.
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r-- | indra/newview/pipeline.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 21052775bd..efb99061ab 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -3420,7 +3420,7 @@ void LLPipeline::renderGeomPostDeferred(LLCamera& camera) glLoadMatrixd(gGLModelView); doOcclusion(camera); gGLLastMatrix = NULL; - glLoadMatrix(gGLModelView); + glLoadMatrixd(gGLModelView); } } |