1 files changed, 9 insertions, 0 deletions

diff --git a/linden/indra/newview/llfasttimerview.cpp b/linden/indra/newview/llfasttimerview.cpp
index c469d8c..c7be3aa 100644
--- a/linden/indra/newview/llfasttimerview.cpp
+++ b/linden/indra/newview/llfasttimerview.cpp
@@ -1108,6 +1108,15 @@ F64 LLFastTimerView::getTime(LLFastTimer::EFastTimerType tidx)
                         break;
                 }
         }
+
+        if (i == FTV_DISPLAY_NUM)
+        {
+                // walked off the end of ft_display_table without finding
+                // the desired timer type
+                llwarns << "Timer type " << tidx << " not known." << llendl;
+                return F64(0.0);
+        }
+
         S32 table_idx = i;
         
         // Add child ticks to parent