diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-06 22:43:38 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-06 22:43:38 +0000 |
| commit | ad332810078a0bbb8fa08fcbfdf3d756de6914f6 (patch) | |
| tree | 1608b2db5d620d323673607ea7ddadfba9d58bda /indra/newview/llnetmap.cpp | |
| parent | a7d9a543e587ffe84b355db7a2e8193bfe6c68b6 (diff) | |
QAR-650 - Viewer RC 9 merge -> release (post cmake)
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
Diffstat (limited to 'indra/newview/llnetmap.cpp')
| -rw-r--r-- | indra/newview/llnetmap.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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); } |