From ad332810078a0bbb8fa08fcbfdf3d756de6914f6 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 6 Jun 2008 22:43:38 +0000 Subject: QAR-650 - Viewer RC 9 merge -> release (post cmake) merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release --- indra/newview/llnetmap.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llnetmap.cpp') diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp index 6e10bfef58..ee184e74b4 100644 --- a/indra/newview/llnetmap.cpp +++ b/indra/newview/llnetmap.cpp @@ -38,7 +38,7 @@ #include "llui.h" #include "llmath.h" // clampf() #include "llfocusmgr.h" -#include "llglimmediate.h" +#include "llrender.h" #include "llagent.h" #include "llcallingcard.h" @@ -299,7 +299,7 @@ void LLNetMap::draw() gGL.end(); // Draw water - glAlphaFunc(GL_GREATER, ABOVE_WATERLINE_ALPHA / 255.f ); + gGL.setAlphaRejectSettings(LLRender::CF_GREATER, ABOVE_WATERLINE_ALPHA / 255.f); { if (regionp->getLand().getWaterTexture()) { @@ -316,7 +316,7 @@ void LLNetMap::draw() gGL.end(); } } - glAlphaFunc(GL_GREATER,0.01f); + gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT); } -- cgit v1.2.3