diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-05-16 17:05:49 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-05-16 17:05:49 -0600 |
| commit | 116d37b4d5883e6020f24ee9c660e9e4511a1574 (patch) | |
| tree | da13250e3423ab608e0c509209eef272fb5e4d64 /indra/newview/llvieweroctree.cpp | |
| parent | 12c34dc30f0cb6270c11e100fcaceb3fa6b27e81 (diff) | |
| parent | 30f8173e9a06f150535e8791786d908f34038c6e (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llvieweroctree.cpp')
| -rw-r--r-- | indra/newview/llvieweroctree.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/llvieweroctree.cpp b/indra/newview/llvieweroctree.cpp index 0fa1f5bef3..62108f0512 100644 --- a/indra/newview/llvieweroctree.cpp +++ b/indra/newview/llvieweroctree.cpp @@ -327,11 +327,7 @@ void LLViewerOctreeEntryData::setVisible() const LLviewerOctreeGroup::~LLviewerOctreeGroup() { - if(LLViewerRegion::sCurRegionp && isVisible()) - { - LLViewerRegion::sCurRegionp->clearVisibleGroup(this); - } - llassert(!LLViewerRegion::sCurRegionp || LLViewerRegion::sCurRegionp->hasVisibleGroup(this) == false); + //empty here } LLviewerOctreeGroup::LLviewerOctreeGroup(OctreeNode* node) : @@ -525,7 +521,7 @@ void LLviewerOctreeGroup::handleChildAddition(const OctreeNode* parent, OctreeNo } else { - OCT_ERRS << "LLSpatialGroup redundancy detected." << llendl; + OCT_ERRS << "LLviewerOctreeGroup redundancy detected." << llendl; } unbound(); |