diff options
Diffstat (limited to 'linden/indra/newview/lldebugview.cpp')
-rw-r--r-- | linden/indra/newview/lldebugview.cpp | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/linden/indra/newview/lldebugview.cpp b/linden/indra/newview/lldebugview.cpp index a512d62..9e64a60 100644 --- a/linden/indra/newview/lldebugview.cpp +++ b/linden/indra/newview/lldebugview.cpp | |||
@@ -43,6 +43,7 @@ | |||
43 | #include "imageids.h" | 43 | #include "imageids.h" |
44 | #include "llvelocitybar.h" | 44 | #include "llvelocitybar.h" |
45 | #include "llviewerwindow.h" | 45 | #include "llviewerwindow.h" |
46 | #include "llfloaterstats.h" | ||
46 | 47 | ||
47 | // | 48 | // |
48 | // Globals | 49 | // Globals |
@@ -100,16 +101,15 @@ LLDebugView::LLDebugView(const std::string& name, const LLRect &rect) | |||
100 | // Debug statistics | 101 | // Debug statistics |
101 | // | 102 | // |
102 | r.set(rect.getWidth() - 250, | 103 | r.set(rect.getWidth() - 250, |
103 | rect.getHeight(), | 104 | rect.getHeight() - 50, |
104 | rect.getWidth(), | 105 | rect.getWidth(), |
105 | rect.getHeight() - 400); | 106 | rect.getHeight() - 450); |
106 | mStatViewp = new LLContainerView("statistics", r); | 107 | mFloaterStatsp = new LLFloaterStats(r); |
107 | mStatViewp->setLabel("Statistics"); | 108 | |
108 | mStatViewp->setFollowsTop(); | 109 | mFloaterStatsp->setFollowsTop(); |
109 | mStatViewp->setFollowsRight(); | 110 | mFloaterStatsp->setFollowsRight(); |
110 | // Default to off | 111 | // since this is a floater, it belongs to LLFloaterView |
111 | mStatViewp->setVisible(FALSE); | 112 | //addChild(mFloaterStatsp); |
112 | addChild(mStatViewp); | ||
113 | 113 | ||
114 | const S32 VELOCITY_LEFT = 10; // 370; | 114 | const S32 VELOCITY_LEFT = 10; // 370; |
115 | const S32 VELOCITY_WIDTH = 500; | 115 | const S32 VELOCITY_WIDTH = 500; |
@@ -130,13 +130,3 @@ LLDebugView::~LLDebugView() | |||
130 | gTextureView = NULL; | 130 | gTextureView = NULL; |
131 | } | 131 | } |
132 | 132 | ||
133 | EWidgetType LLDebugView::getWidgetType() const | ||
134 | { | ||
135 | return WIDGET_TYPE_DEBUG_VIEW; | ||
136 | } | ||
137 | |||
138 | LLString LLDebugView::getWidgetTag() const | ||
139 | { | ||
140 | return LL_DEBUG_VIEW_TAG; | ||
141 | } | ||
142 | |||