diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-09-21 14:25:48 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-09-21 14:25:48 -0700 |
| commit | 5ae6bbc848e0146bb4b5ea5dd4a5d26d2c5702ba (patch) | |
| tree | cfd1c052aef51bfa95298613a95fc78f64c3aefc /indra/newview/lldebugview.cpp | |
| parent | 7bc6e626f40a910b4a3e5b88161e96b9967bd24d (diff) | |
| parent | 305b65f6f600b81de9a78e1246d2a5353cc3189b (diff) | |
EXP-1207 : merge with viewer-experience-fui
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(); |