diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-09-14 10:51:00 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-09-14 10:51:00 -0700 |
| commit | 088f04d9c1f5f6e2b0613a9f3ed4d26e7b9210bf (patch) | |
| tree | 5021691b5296f06afd500b1eb1731d254fc297dd /indra/newview/lldebugview.cpp | |
| parent | 7f11cff7972e914d4cb15f72d015100fab3ce212 (diff) | |
| parent | 8b7c07651c4e2c57e06c283243b30e03da327b42 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
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(); |