diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-10-23 15:45:48 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-10-23 15:45:48 -0600 |
| commit | 066182bf064d74c84313220dba3a10a3c318d634 (patch) | |
| tree | 4675aa11eb0a977886016e9e2c62a1f8a621666c /indra/newview/llspatialpartition.cpp | |
| parent | ab43be5ddb50198304de1ae0e82b641c7d343449 (diff) | |
| parent | 806cd01a0da1c67aaccd0bdcb40c104d48ed9d25 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
| -rwxr-xr-x | indra/newview/llspatialpartition.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 449a192332..55c0acd3f9 100755 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -903,7 +903,7 @@ void LLSpatialGroup::destroyGL(bool keep_occlusion) { setState(LLSpatialGroup::GEOM_DIRTY | LLSpatialGroup::IMAGE_DIRTY); - if (!keep_occlusion && !LLSpatialPartition::sTeleportRequested) + if (!keep_occlusion) { //going to need a rebuild gPipeline.markRebuild(this, TRUE); } |