diff options
| -rwxr-xr-x | indra/llmath/lloctree.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h index 7fa1661bc2..4d4923acf0 100755 --- a/indra/llmath/lloctree.h +++ b/indra/llmath/lloctree.h @@ -445,7 +445,7 @@ public: mDataEnd = &mData[0]; } - BaseType::notifyRemoval(data); + this->notifyRemoval(data); checkAlive(); } @@ -755,10 +755,10 @@ public: return false; } - if (this->getSize()[0] > data->getBinRadius() && oct_node::isInside(data->getPositionGroup())) + if (this->getSize()[0] > data->getBinRadius() && this->isInside(data->getPositionGroup())) { //we got it, just act like a branch - oct_node* node = oct_node::getNodeAt(data); + oct_node* node = this->getNodeAt(data); if (node == this) { LLOctreeNode<T>::insert(data); @@ -771,7 +771,7 @@ public: else if (this->getChildCount() == 0) { //first object being added, just wrap it up - while (!(this->getSize()[0] > data->getBinRadius() && oct_node::isInside(data->getPositionGroup()))) + while (!(this->getSize()[0] > data->getBinRadius() && this->isInside(data->getPositionGroup()))) { LLVector4a center, size; center = this->getCenter(); @@ -786,7 +786,7 @@ public: } else { - while (!(this->getSize()[0] > data->getBinRadius() && oct_node::isInside(data->getPositionGroup()))) + while (!(this->getSize()[0] > data->getBinRadius() && this->isInside(data->getPositionGroup()))) { //the data is outside the root node, we need to grow LLVector4a center(this->getCenter()); |