diff options
author | Oz Linden <oz@lindenlab.com> | 2011-09-19 16:58:21 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-09-19 16:58:21 -0400 |
commit | 1911586ce41e1b77be8e1e9e88c0de4c508e1b42 (patch) | |
tree | 9cf1e058b26db11b29152f90bf88f027d4a21190 /indra/newview/lldebugview.cpp | |
parent | 9ac33479aa2fa2a0ad7ec5903bc364a07d1a8c74 (diff) | |
parent | 1d3f6ef432b714a7659e9a5ee62377e56a843006 (diff) |
storm-1610
Diffstat (limited to 'indra/newview/lldebugview.cpp')
-rw-r--r-- | indra/newview/lldebugview.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/lldebugview.cpp b/indra/newview/lldebugview.cpp index 216cc66ef8..cc6ba05e7e 100644 --- a/indra/newview/lldebugview.cpp +++ b/indra/newview/lldebugview.cpp @@ -41,6 +41,7 @@ #include "llmemoryview.h" #include "llsceneview.h" #include "llviewertexture.h" +#include "llfloaterreg.h" // // Globals @@ -79,12 +80,7 @@ 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); + mFastTimerView = dynamic_cast<LLFastTimerView*>(LLFloaterReg::getInstance("fast_timers")); gSceneView = new LLSceneView(r); gSceneView->setFollowsTop(); |