diff options
| author | Richard Linden <none@none> | 2012-08-30 16:46:37 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-08-30 16:46:37 -0700 |
| commit | 64201b21b3d02f98969981723ef5426cdbfc16be (patch) | |
| tree | bad259357973946b55b1c56c8e6b6fda488a0c48 /indra/newview | |
| parent | 5a03b8282da64433c2525f0950e8fb86995f66dc (diff) | |
MAINT-1486 FIX Crash on login (Unhandled exception)
allow duplicate named fast timers again, refactored timer code
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfasttimerview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index 59bf70f488..fd92f8ac18 100644 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -511,7 +511,7 @@ void LLFastTimerView::draw() x += dx; BOOL is_child_of_hover_item = (idp == mHoverID); LLFastTimer::NamedTimer* next_parent = idp->getParent(); - while(!is_child_of_hover_item && next_parent) + while(!is_child_of_hover_item && next_parent && next_parent != next_parent->getParent()) { is_child_of_hover_item = (mHoverID == next_parent); next_parent = next_parent->getParent(); @@ -778,7 +778,7 @@ void LLFastTimerView::draw() BOOL is_child_of_hover_item = (idp == mHoverID); LLFastTimer::NamedTimer* next_parent = idp->getParent(); - while(!is_child_of_hover_item && next_parent) + while(!is_child_of_hover_item && next_parent && next_parent != next_parent->getParent()) { is_child_of_hover_item = (mHoverID == next_parent); next_parent = next_parent->getParent(); |