From 55a66737c028bcc52c21b991b4d6b437b495250f Mon Sep 17 00:00:00 2001 From: Shyotl Date: Thu, 12 Jan 2012 23:24:44 -0600 Subject: [PATCH 1/2] Disable a certain octree error that likes to fire a bit frequently. --- indra/llmath/lloctree.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h index 8a941909b..c55c66dd8 100644 --- a/indra/llmath/lloctree.h +++ b/indra/llmath/lloctree.h @@ -691,7 +691,7 @@ public: if (lt != 0x7) { - OCT_ERRS << "!!! ELEMENT EXCEEDS RANGE OF SPATIAL PARTITION !!!" << llendl; + //OCT_ERRS << "!!! ELEMENT EXCEEDS RANGE OF SPATIAL PARTITION !!!" << llendl; return false; } From 21b6b895770aa55dac6be442c16a42153990424f Mon Sep 17 00:00:00 2001 From: Shyotl Date: Thu, 12 Jan 2012 23:28:38 -0600 Subject: [PATCH 2/2] If this assert hits then I want your callstack, and so does Bao Linden. SH-2827 --- indra/llrender/llrender.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index 5eec0c553..133614e0d 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -1446,6 +1446,8 @@ void LLRender::loadIdentity() flush(); { + llassert_always(mMatrixMode < NUM_MATRIX_MODES) ; + mMatrix[mMatrixMode][mMatIdx[mMatrixMode]].make_identity(); mMatHash[mMatrixMode]++; }