diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-03-04 16:59:57 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-03-04 16:59:57 +0000 |
| commit | a10f9639004b4eedc3b6e7b624912ff4ebd8fdc5 (patch) | |
| tree | 051625f9ac6a0d08f613cf11da318c3fd30b06a9 /indra/newview/lldebugview.cpp | |
| parent | 62d9c7f76ce4953064fbc2a778ad4ecefb918e01 (diff) | |
svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge
QAR-343 - merge maint-ui-7 and maint-ui-8 to release
Diffstat (limited to 'indra/newview/lldebugview.cpp')
| -rw-r--r-- | indra/newview/lldebugview.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/indra/newview/lldebugview.cpp b/indra/newview/lldebugview.cpp index 0921941fdd..3fb7da7baa 100644 --- a/indra/newview/lldebugview.cpp +++ b/indra/newview/lldebugview.cpp @@ -43,6 +43,7 @@ #include "imageids.h" #include "llvelocitybar.h" #include "llviewerwindow.h" +#include "llfloaterstats.h" // // Globals @@ -100,16 +101,16 @@ LLDebugView::LLDebugView(const std::string& name, const LLRect &rect) // Debug statistics // r.set(rect.getWidth() - 250, - rect.getHeight(), + rect.getHeight() - 50, rect.getWidth(), - rect.getHeight() - 400); - mStatViewp = new LLContainerView("statistics", r); - mStatViewp->setLabel("Statistics"); - mStatViewp->setFollowsTop(); - mStatViewp->setFollowsRight(); + rect.getHeight() - 450); + mFloaterStatsp = new LLFloaterStats(r); + + mFloaterStatsp->setFollowsTop(); + mFloaterStatsp->setFollowsRight(); // Default to off - mStatViewp->setVisible(FALSE); - addChild(mStatViewp); + mFloaterStatsp->setVisible(FALSE); + addChild(mFloaterStatsp); const S32 VELOCITY_LEFT = 10; // 370; const S32 VELOCITY_WIDTH = 500; |