diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-09 10:44:14 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-09 10:44:14 +0100 |
| commit | d1c701dc6b506e3cf6ed222fa651c8032a4141f3 (patch) | |
| tree | 942fb33a5b49581558c5aaa39fac3366c11c04a0 /indra/newview/llspatialpartition.cpp | |
| parent | 794982dad5bc5c4725830b95245e476de79a80c7 (diff) | |
| parent | b13af3b8baa05d20ae9f33046f100596182f6be0 (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); } |