diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-01-09 22:43:10 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-01-09 22:43:10 -0700 |
| commit | 7cc37d949e9319a5b60641ff8453a0fed763d817 (patch) | |
| tree | 366eeb2e217c26f589fa98c8e777a38d22c6df3b /indra/newview/llvieweroctree.cpp | |
| parent | 8315e9745398c1c3215ffe1b3bfbfb6c7d16291d (diff) | |
fix the merge errors from the changeset 3eadda9666cf
Diffstat (limited to 'indra/newview/llvieweroctree.cpp')
| -rw-r--r-- | indra/newview/llvieweroctree.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llvieweroctree.cpp b/indra/newview/llvieweroctree.cpp index 7f502a6c51..cfa24c32ed 100644 --- a/indra/newview/llvieweroctree.cpp +++ b/indra/newview/llvieweroctree.cpp @@ -347,6 +347,15 @@ LLviewerOctreeGroup::LLviewerOctreeGroup(OctreeNode* node) : mOctreeNode->addListener(this); } +bool LLviewerOctreeGroup::hasElement(LLViewerOctreeEntryData* data) +{ + if(!data->getEntry()) + { + return false; + } + return std::find(getDataBegin(), getDataEnd(), data->getEntry()) != getDataEnd(); +} + bool LLviewerOctreeGroup::removeFromGroup(LLViewerOctreeEntryData* data) { return removeFromGroup(data->getEntry()); |