diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-05-05 19:41:56 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-05-05 19:41:56 +0300 |
| commit | 43517c5adc69ecb1d8a5e031a9e2840b005eecf9 (patch) | |
| tree | 0bfb56fe055f700b66c73efffab741c69925e9f3 /indra/llmath/lloctree.h | |
| parent | f3add82a4c7f34bfff285302c34d952902451cad (diff) | |
SL-17244 Fix 'empty leaf' crashes
Diffstat (limited to 'indra/llmath/lloctree.h')
| -rw-r--r-- | indra/llmath/lloctree.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h index 2283df1e1a..a9a54a8113 100644 --- a/indra/llmath/lloctree.h +++ b/indra/llmath/lloctree.h @@ -73,7 +73,7 @@ template <class T> class LLOctreeTravelerDepthFirst : public LLOctreeTraveler<T> { public: - virtual void traverse(const LLOctreeNode<T>* node); + virtual void traverse(const LLOctreeNode<T>* node) override; }; template <class T> @@ -696,7 +696,7 @@ public: { } - bool balance() + bool balance() override { //LL_PROFILE_ZONE_NAMED_COLOR("Octree::balance()",OCTREE_DEBUG_COLOR_BALANCE); @@ -732,7 +732,7 @@ public: } // LLOctreeRoot::insert - bool insert(T* data) + bool insert(T* data) override { if (data == NULL) { @@ -835,6 +835,12 @@ public: return false; } + + bool isLeaf() const override + { + // root can't be a leaf + return false; + } }; //======================== |