diff options
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llfasttimerview.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llfasttimerview.h | 12 | ||||
| -rwxr-xr-x | indra/newview/llstartup.cpp | 4 |
3 files changed, 7 insertions, 11 deletions
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index bbd8f0792a..4809a6b7da 100755 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -62,7 +62,7 @@ static const S32 MAX_VISIBLE_HISTORY = 12; static const S32 LINE_GRAPH_HEIGHT = 240; static const S32 MIN_BAR_HEIGHT = 3; static const S32 RUNNING_AVERAGE_WIDTH = 100; -static const S32 NUM_FRAMES_HISTORY = 256; +static const S32 NUM_FRAMES_HISTORY = 200; std::vector<TimeBlock*> ft_display_idx; // line of table entry for display purposes (for collapse) diff --git a/indra/newview/llfasttimerview.h b/indra/newview/llfasttimerview.h index 8c8eb99b59..672bb5d7ca 100755 --- a/indra/newview/llfasttimerview.h +++ b/indra/newview/llfasttimerview.h @@ -87,12 +87,12 @@ private: mFirstChild(false), mLastChild(false) {} - F32Seconds mTotalTime, - mSelfTime, - mChildrenStart, - mChildrenEnd, - mSelfStart, - mSelfEnd; + F32Seconds mTotalTime, + mSelfTime, + mChildrenStart, + mChildrenEnd, + mSelfStart, + mSelfEnd; LLTrace::TimeBlock* mTimeBlock; bool mVisible, mFirstChild, diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 39ced906ad..72c76f9424 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2176,10 +2176,6 @@ bool idle_startup() // reset keyboard focus to sane state of pointing at world gFocusMgr.setKeyboardFocus(NULL); -#if 0 // sjb: enable for auto-enabling timer display - gDebugView->mFastTimerView->setVisible(TRUE); -#endif - LLAppViewer::instance()->handleLoginComplete(); LLAgentPicksInfo::getInstance()->requestNumberOfPicks(); |