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.h | |
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.h')
-rw-r--r-- | indra/newview/lldebugview.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldebugview.h b/indra/newview/lldebugview.h index 075e8d7c39..36d367e40d 100644 --- a/indra/newview/lldebugview.h +++ b/indra/newview/lldebugview.h @@ -46,7 +46,7 @@ class LLFastTimerView; class LLMemoryView; class LLConsole; class LLTextureView; -class LLContainerView; +class LLFloaterStats; class LLDebugView : public LLView { @@ -61,7 +61,7 @@ public: LLFastTimerView* mFastTimerView; LLMemoryView* mMemoryView; LLConsole* mDebugConsolep; - LLContainerView* mStatViewp; + LLFloaterStats* mFloaterStatsp; }; extern LLDebugView* gDebugView; |