summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-07 16:06:13 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-07 16:06:13 +0100
commit1cb8c584911e02d0daa9ce1ed44fd801885d9773 (patch)
treee5671bce73f1525b6aa4c13dc5555266636a8d46
parent51ab9ae63c3c2a1d7f188fb73af1b7074331eae4 (diff)
merge fix.
-rw-r--r--indra/newview/pipeline.cpp2
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);
}
}