diff options
author | Oz Linden <oz@lindenlab.com> | 2011-08-19 16:50:08 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-08-19 16:50:08 -0400 |
commit | 7ffc8b45e2cee4389d3b9f3c20ae213e6430d57b (patch) | |
tree | 2095b3a3d55990e7a534fee31226c3caa096c699 /indra/newview/llglsandbox.cpp | |
parent | f40d2c5afb78f4a17b4753c42f6756dbd76a18c8 (diff) | |
parent | 2b40cbb13d03d2e55eb7540f5f59856fb3e6a9cc (diff) |
merge changes for storm-1564
Diffstat (limited to 'indra/newview/llglsandbox.cpp')
-rw-r--r-- | indra/newview/llglsandbox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp index 842911ecc0..fa3f546157 100644 --- a/indra/newview/llglsandbox.cpp +++ b/indra/newview/llglsandbox.cpp @@ -620,7 +620,7 @@ void LLViewerParcelMgr::renderCollisionSegments(U8* segments, BOOL use_pass, LLV F32 pos_y = pos.mV[VY]; LLGLSUIDefault gls_ui; - LLGLDepthTest gls_depth(GL_TRUE); + LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE); LLGLDisable cull(GL_CULL_FACE); if (mCollisionBanned == BA_BANNED) |