From 1cb8c584911e02d0daa9ce1ed44fd801885d9773 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 7 Apr 2010 16:06:13 +0100
Subject: merge fix.

---
 indra/newview/pipeline.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
 	}
 }
 
-- 
cgit v1.2.3