1 files changed, 6 insertions, 0 deletions

diff --git a/linden/indra/newview/llframestatview.cpp b/linden/indra/newview/llframestatview.cpp
index af9162d..c489caa 100644
--- a/linden/indra/newview/llframestatview.cpp
+++ b/linden/indra/newview/llframestatview.cpp
@@ -378,6 +378,12 @@ void LLFrameStatView::draw()
 
 void LLFrameStatView::addStat(LLStat *statp, const char *label, const LLColor4 &color)
 {
+        if( mNumStats >= MAX_STATS )
+        {
+                llwarns << "LLFrameStatView::addStat - too many stats!" << llendl;
+                return;
+        }
+
         mStats[mNumStats] = statp;
         mColors[mNumStats] = color;
         mLabels[mNumStats] = label;