summaryrefslogtreecommitdiff
path: root/indra/newview/lldebugview.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-03-03 11:07:52 -0500
committerLoren Shih <seraph@lindenlab.com>2010-03-03 11:07:52 -0500
commit8e37dd516ab68bf11aaa9ab76945de36053df057 (patch)
treefa790d4832fc46c1b9349314f1b7d1fef8987acd /indra/newview/lldebugview.cpp
parent0ac63ffbb1acb32278645f6a9ab97cdc271c8d30 (diff)
parentf53f121eb069dbf50334c424390151074d4fcad7 (diff)
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/lldebugview.cpp')
-rw-r--r--indra/newview/lldebugview.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lldebugview.cpp b/indra/newview/lldebugview.cpp
index 169a963d0d..f113cc49d4 100644
--- a/indra/newview/lldebugview.cpp
+++ b/indra/newview/lldebugview.cpp
@@ -81,11 +81,13 @@ void LLDebugView::init()
r.setLeftTopAndSize(25, rect.getHeight() - 50, (S32) (gViewerWindow->getWindowRectScaled().getWidth() * 0.75f),
(S32) (gViewerWindow->getWindowRectScaled().getHeight() * 0.75f));
+
mFastTimerView = new LLFastTimerView(r);
mFastTimerView->setFollowsTop();
mFastTimerView->setFollowsLeft();
mFastTimerView->setVisible(FALSE); // start invisible
addChild(mFastTimerView);
+ mFastTimerView->setRect(rect);
r.setLeftTopAndSize(25, rect.getHeight() - 50, (S32) (gViewerWindow->getWindowRectScaled().getWidth() * 0.75f),
(S32) (gViewerWindow->getWindowRectScaled().getHeight() * 0.75f));