diff options
| author | simon <none@none> | 2014-02-18 16:41:21 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-02-18 16:41:21 -0800 |
| commit | 52ce788d0cf77361dc337edaf136f401acd0d4a9 (patch) | |
| tree | 10b483a50bb1f3d897ece66d118036201bd74af7 /indra/newview/llglsandbox.cpp | |
| parent | 54ab932884c386950f4f31b9ee63446053c03d59 (diff) | |
| parent | a347267cf1c55a3bd57d30117b8aa834623e1d61 (diff) | |
Pull in viewer-lion to lock down next 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 c4c1827266..cf550e5eff 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; } |