diff options
author | simon <none@none> | 2013-12-06 15:44:18 -0800 |
---|---|---|
committer | simon <none@none> | 2013-12-06 15:44:18 -0800 |
commit | 5bef9571599bdeff5061046902b6afb174c6a3e2 (patch) | |
tree | 4514a8862e7eb79fe1a44e8ca320b99782d52ef5 /indra/newview/llglsandbox.cpp | |
parent | 443c502ccc3abe50b7747fb2ba4d3b6bd74c1dc6 (diff) |
MAINT-3530 : Add viewer checkbox to extend parcel entry limits to a higher ceiling
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; } |