diff options
| author | Cinder <cinder.roxley@phoenixviewer.com> | 2014-06-07 14:14:29 -0600 |
|---|---|---|
| committer | Cinder <cinder.roxley@phoenixviewer.com> | 2014-06-07 14:14:29 -0600 |
| commit | 79e0e7d2980b28660716f43d0f0518a107117e83 (patch) | |
| tree | a5d506aa55aa6970b46ff1e493b6d5f9cb410470 /indra/newview/llglsandbox.cpp | |
| parent | e6b20328c2e25223359dede17357682b5b4e7ea1 (diff) | |
| parent | 98720c3cec8f1ab4af5e66f9d9b7bb9c277b78f1 (diff) | |
Merge upstream
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; } |