diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-05-28 09:06:58 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-05-28 09:06:58 -0700 |
| commit | 038f250caea80e21192372019dca8fdcf269c0d9 (patch) | |
| tree | 2d5d0ec8fcc86886c27ffc58166183ce5f96be58 /indra/newview/llglsandbox.cpp | |
| parent | fbe10b8ee0537c71f2119142f4e0da1bd69d1a53 (diff) | |
| parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) | |
Merge with head of viewer-release
Diffstat (limited to 'indra/newview/llglsandbox.cpp')
| -rwxr-xr-x | indra/newview/llglsandbox.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp index bede9b1e6c..c386030329 100755 --- a/indra/newview/llglsandbox.cpp +++ b/indra/newview/llglsandbox.cpp @@ -624,7 +624,8 @@ void LLViewerParcelMgr::renderCollisionSegments(U8* segments, BOOL use_pass, LLV LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE); LLGLDisable cull(GL_CULL_FACE); - if (mCollisionBanned == BA_BANNED) + if (mCollisionBanned == BA_BANNED || + regionp->getRegionFlag(REGION_FLAGS_BLOCK_FLYOVER)) { collision_height = BAN_HEIGHT; } |