diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-04-08 20:43:49 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-04-08 20:43:49 -0500 |
| commit | b91b613e63ec958d5895c72a8d43c6cc29212626 (patch) | |
| tree | b92221e4d4bdc09975fc9cdca9f5fd55d3aaed8c /indra/newview/llspatialpartition.cpp | |
| parent | 7b807553e175243b393195a9608b6f12d12ecaa9 (diff) | |
| parent | 1df3e85d2d73820a3129ebeb1a3e4c88338e5a93 (diff) | |
merge
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
| -rw-r--r-- | indra/newview/llspatialpartition.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 3742f70df5..77c38798d1 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -1924,11 +1924,8 @@ public: return; } - if (mRes == 2) - { - //fully in, don't traverse further (won't effect extents - } - else if (mRes && group->isState(LLSpatialGroup::SKIP_FRUSTUM_CHECK)) + if ((mRes && group->isState(LLSpatialGroup::SKIP_FRUSTUM_CHECK)) || + mRes == 2) { //don't need to do frustum check LLSpatialGroup::OctreeTraveler::traverse(n); } |