Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

2012-01-13 00:32:03 -05:00
parent 198e499798 21b6b89577
commit b96beb478c
2 changed files with 3 additions and 1 deletions
--- 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;
 		}

--- 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]++;
 	}