From a18f9c1b38d721825f5b6f0880aac529cdb2fa9e Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 14 Nov 2014 23:15:46 +0100 Subject: [PATCH] FIRE-14600: Proposed fix for crash in fasttimer view: mBars might be null --- indra/newview/llfasttimerview.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index 1b1f1189d7..5d5050103c 100755 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -256,6 +256,14 @@ BOOL LLFastTimerView::handleHover(S32 x, S32 y, MASK mask) bar_index < end_index; ++bar_index) { + // FIRE-14600: mBars might be null here + if (!row.mBars) + { + LL_WARNS() << "Skipping null row bars" << LL_ENDL; + continue; + } + // + TimerBar& bar = row.mBars[bar_index]; if (bar.mSelfStart > mouse_time_offset) {