diff options
Diffstat (limited to 'indra/newview/llfasttimerview.cpp')
-rwxr-xr-x | indra/newview/llfasttimerview.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index f956851129..d3a97fde0e 100755 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -274,7 +274,7 @@ BOOL LLFastTimerView::handleHover(S32 x, S32 y, MASK mask) { hover_bar = &bar; if (bar.mTimeBlock->getTreeNode().mCollapsed) - { + { // stop on first collapsed timeblock, since we can't select any children break; } @@ -282,14 +282,14 @@ BOOL LLFastTimerView::handleHover(S32 x, S32 y, MASK mask) } if (hover_bar) - { + { mHoverID = hover_bar->mTimeBlock; if (mHoverTimer != mHoverID) - { - // could be that existing tooltip is for a parent and is thus - // covering region for this new timer, go ahead and unblock - // so we can create a new tooltip - LLToolTipMgr::instance().unblockToolTips(); + { + // could be that existing tooltip is for a parent and is thus + // covering region for this new timer, go ahead and unblock + // so we can create a new tooltip + LLToolTipMgr::instance().unblockToolTips(); mHoverTimer = mHoverID; mToolTipRect.set(mBarRect.mLeft + (hover_bar->mSelfStart / mTotalTimeDisplay) * mBarRect.getWidth(), row.mTop, @@ -392,7 +392,7 @@ void LLFastTimerView::draw() mDisplayMode = llclamp(getChild<LLComboBox>("time_scale_combo")->getCurrentIndex(), 0, 3); mDisplayType = (EDisplayType)llclamp(getChild<LLComboBox>("metric_combo")->getCurrentIndex(), 0, 2); - + generateUniqueColors(); LLView::drawChildren(); @@ -408,12 +408,12 @@ void LLFastTimerView::draw() legend_panel->localRectToOtherView(legend_panel->getLocalRect(), &mLegendRect, this); // Draw the window background - gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); + gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); gl_rect_2d(getLocalRect(), LLColor4(0.f, 0.f, 0.f, 0.25f)); - + drawHelp(getRect().getHeight() - MARGIN); drawLegend(); - + //mBarRect.mLeft = MARGIN + LEGEND_WIDTH + 8; //mBarRect.mTop = y; //mBarRect.mRight = getRect().getWidth() - MARGIN; @@ -423,26 +423,26 @@ void LLFastTimerView::draw() drawLineGraph(); printLineStats(); LLView::draw(); - + mAllTimeMax = llmax(mAllTimeMax, mRecording.getLastRecording().getSum(FTM_FRAME)); mHoverID = NULL; mHoverBarIndex = -1; -} + } void LLFastTimerView::onOpen(const LLSD& key) -{ + { setPauseState(false); mRecording.reset(); mRecording.appendPeriodicRecording(LLTrace::get_frame_recording()); for(std::deque<TimerBarRow>::iterator it = mTimerBarRows.begin(), end_it = mTimerBarRows.end(); it != end_it; - ++it) - { + ++it) + { delete []it->mBars; it->mBars = NULL; - } -} - + } + } + void saveChart(const std::string& label, const char* suffix, LLImageRaw* scratch) { @@ -1113,7 +1113,7 @@ void LLFastTimerView::drawLineGraph() F32 x = mGraphRect.mRight - j * (F32)(mGraphRect.getWidth())/(mRecording.getNumRecordedPeriods()-1); F32 y; switch(mDisplayType) - { +{ case DISPLAY_TIME: y = mGraphRect.mBottom + time.value() * time_scale_factor; break; @@ -1126,7 +1126,7 @@ void LLFastTimerView::drawLineGraph() } gGL.vertex2f(x,y); gGL.vertex2f(x,mGraphRect.mBottom); - } +} gGL.end(); if (mHoverID == idp) |