From 7376c833c70fa8253ca4cd0f2f5fc2ed9bd76f49 Mon Sep 17 00:00:00 2001 From: Latif Khalifa Date: Tue, 10 Sep 2013 13:22:01 +0200 Subject: [PATCH] Removed internal limit 2^20 for lloctree This addresses "4096 bug" affecting long Opensim teleports Patch by NickyD (Firestorm) Refereces: https://jira.secondlife.com/browse/SVC-2941 http://redmine.kokuaviewer.org/issues/465 http://jira.phoenixviewer.com/browse/FIRE-11593 --- indra/llmath/lloctree.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h index b5252d055..a1305a4df 100644 --- a/indra/llmath/lloctree.h +++ b/indra/llmath/lloctree.h @@ -1009,6 +1009,9 @@ public: return false; } +// Singu note: Don't limit center of octree to 2^20, otherwise we end with the famous longjump bug (cannot TP further than 4095 regions [4096*256 = 2^20] +// SVC-2941 FIRE-11593 +#if 0 LLVector4a MAX_MAG; MAX_MAG.splat(1024.f*1024.f); @@ -1024,6 +1027,7 @@ public: //OCT_ERRS << "!!! ELEMENT EXCEEDS RANGE OF SPATIAL PARTITION !!!" << llendl; return false; } +#endif if (this->getSize()[0] > data->getBinRadius() && this->isInside(data->getPositionGroup())) {