diff options
| author | Richard Linden <none@none> | 2012-08-30 18:35:29 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-08-30 18:35:29 -0700 |
| commit | afc2807302f2a94b5cbb0fe86f304984ac7e50b8 (patch) | |
| tree | fe3984d5de892c7a1bf726d32f45dbaeeebf7397 /indra/newview | |
| parent | 5a03b8282da64433c2525f0950e8fb86995f66dc (diff) | |
MAINT-1486 FIX Crash on login (Unhandled exception)
cleaner implementation of llfasttimers...don't bother to share similarly named timers
just create multiple timers with same name...doesn't break anything
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfasttimerview.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index 59bf70f488..4dfb93f1bc 100644 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -514,6 +514,7 @@ void LLFastTimerView::draw() while(!is_child_of_hover_item && next_parent) { is_child_of_hover_item = (mHoverID == next_parent); + if (next_parent->getParent() == next_parent) break; next_parent = next_parent->getParent(); } @@ -781,6 +782,7 @@ void LLFastTimerView::draw() while(!is_child_of_hover_item && next_parent) { is_child_of_hover_item = (mHoverID == next_parent); + if (next_parent->getParent() == next_parent) break; next_parent = next_parent->getParent(); } |