diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h
index 53fae50d6a..ebcf9651ec 100755
--- a/indra/llmath/lloctree.h
+++ b/indra/llmath/lloctree.h
@@ -734,6 +734,7 @@ public:
 			return false;
 		}
 		
+#ifndef OPENSIM // <FS:ND> FIRE-11593; 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]
 		LLVector4a MAX_MAG;
 		MAX_MAG.splat(1024.f*1024.f);
 
@@ -749,6 +750,7 @@ public:
 			//OCT_ERRS << "!!! ELEMENT EXCEEDS RANGE OF SPATIAL PARTITION !!!" << llendl;
 			return false;
 		}
+#endif // <FS:ND> FIRE-11593
 
 		if (this->getSize()[0] > data->getBinRadius() && this->isInside(data->getPositionGroup()))
 		{