diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h index 4889da246e7e92bbc4dde54b47700dbc54910e62..7fa1661bc2683cc803e54e861e694fee5f2d113c 100755 --- a/indra/llmath/lloctree.h +++ b/indra/llmath/lloctree.h @@ -445,7 +445,7 @@ class LLOctreeNode : public LLTreeNode<T> mDataEnd = &mData[0]; } - notifyRemoval(data); + BaseType::notifyRemoval(data); checkAlive(); } @@ -711,7 +711,7 @@ class LLOctreeRoot : public LLOctreeNode<T> //(don't notify listeners of addition) for (U32 i = 0; i < child->getChildCount(); i++) { - addChild(child->getChild(i), TRUE); + this->addChild(child->getChild(i), TRUE); } //destroy child @@ -755,10 +755,10 @@ class LLOctreeRoot : public LLOctreeNode<T> return false; } - if (this->getSize()[0] > data->getBinRadius() && isInside(data->getPositionGroup())) + if (this->getSize()[0] > data->getBinRadius() && oct_node::isInside(data->getPositionGroup())) { //we got it, just act like a branch - oct_node* node = getNodeAt(data); + oct_node* node = oct_node::getNodeAt(data); if (node == this) { LLOctreeNode<T>::insert(data); @@ -771,7 +771,7 @@ class LLOctreeRoot : public LLOctreeNode<T> else if (this->getChildCount() == 0) { //first object being added, just wrap it up - while (!(this->getSize()[0] > data->getBinRadius() && isInside(data->getPositionGroup()))) + while (!(this->getSize()[0] > data->getBinRadius() && oct_node::isInside(data->getPositionGroup()))) { LLVector4a center, size; center = this->getCenter(); @@ -786,7 +786,7 @@ class LLOctreeRoot : public LLOctreeNode<T> } else { - while (!(this->getSize()[0] > data->getBinRadius() && isInside(data->getPositionGroup()))) + while (!(this->getSize()[0] > data->getBinRadius() && oct_node::isInside(data->getPositionGroup()))) { //the data is outside the root node, we need to grow LLVector4a center(this->getCenter()); @@ -814,7 +814,7 @@ class LLOctreeRoot : public LLOctreeNode<T> //clear our children and add the root copy this->clearChildren(); - addChild(newnode); + this->addChild(newnode); } //insert the data