Commit

r57479:6b753a247e1b public

Description:

SL-6306 Viewer freeze and crash on octree

Commit status:

[Not Reviewed]

References:

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Author

andreykproductengine
-
Add another comment

r57479:6b753a247e1b -

@@ -433,7 +433,7
433 }
433 }
434 }
434 }
435 #ifndef OPENSIM // <FS:CR> FIRE-11593: Opensim "4096 Bug" Fix by Latif Khalifa
435 #ifndef OPENSIM // <FS:CR> FIRE-11593: Opensim "4096 Bug" Fix by Latif Khalifa
436 else
436 else if (parent)
437 {
437 {
438 //it's not in here, give it to the root
438 //it's not in here, give it to the root
439 OCT_ERRS << "Octree insertion failed, starting over from root!" << LL_ENDL;
439 OCT_ERRS << "Octree insertion failed, starting over from root!" << LL_ENDL;
@@ -448,6 +448,13
448
448
449 node->insert(data);
449 node->insert(data);
450 }
450 }
451 else
452 {
453 // It's not in here, and we are root.
454 // LLOctreeRoot::insert() should have expanded
455 // root by now, something is wrong
456 OCT_ERRS << "Octree insertion failed! Root expansion failed." << LL_ENDL;
457 }
451 #endif // <FS:CR> FIRE-11593: Opensim "4096 Bug" Fix by Latif Khalifa
458 #endif // <FS:CR> FIRE-11593: Opensim "4096 Bug" Fix by Latif Khalifa
452
459
453 return false;
460 return false;
@@ -800,9 +807,14
800 {
807 {
801 LLOctreeNode<T>::insert(data);
808 LLOctreeNode<T>::insert(data);
802 }
809 }
810 else if (node->isInside(data->getPositionGroup()))
811 {
812 node->insert(data);
813 }
803 else
814 else
804 {
815 {
805 node->insert(data);
816 // calling node->insert(data) will return us to root
817 OCT_ERRS << "Failed to insert data at child node" << LL_ENDL;
806 }
818 }
807 }
819 }
808 else if (this->getChildCount() == 0)
820 else if (this->getChildCount() == 0)
You need to be logged in to leave comments. Login now