diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2009-09-26 18:08:24 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2009-09-26 18:08:24 -0400 |
commit | bc4444cd78067cbf11d3ffb210375a31a33f96bd (patch) | |
tree | d9b8e78db237869e630fec6c71335d1294cec101 /indra/newview/lldebugview.cpp | |
parent | 8ddc0c0ac43e9d10bf0262cd1ab3c0e79808fc14 (diff) | |
parent | 09bf3c1fec107e9e66514837d208ef62a6b67b91 (diff) |
Merge into viewer/viewer-20 yesterday's lindenlab/svn-imports-viewer-20
Diffstat (limited to 'indra/newview/lldebugview.cpp')
-rw-r--r-- | indra/newview/lldebugview.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/lldebugview.cpp b/indra/newview/lldebugview.cpp index bd5b9c30a2..24a57cb0c1 100644 --- a/indra/newview/lldebugview.cpp +++ b/indra/newview/lldebugview.cpp @@ -102,6 +102,17 @@ LLDebugView::LLDebugView(const LLDebugView::Params& p) gTextureView = LLUICtrlFactory::create<LLTextureView>(tvp); addChild(gTextureView); //gTextureView->reshape(r.getWidth(), r.getHeight(), TRUE); +#if !LL_RELEASE_FOR_DOWNLOAD + r.set(150, rect.getHeight() - 50, 900 + LLImageGL::sTextureLoadedCounter.size() * 30, 100); + LLTextureSizeView::Params tsvp; + tsvp.name("gTextureSizeView"); + tsvp.rect(r); + tsvp.follows.flags(FOLLOWS_BOTTOM|FOLLOWS_LEFT); + tsvp.visible(false); + gTextureSizeView = LLUICtrlFactory::create<LLTextureSizeView>(tsvp); + addChild(gTextureSizeView); +#endif + } @@ -110,5 +121,6 @@ LLDebugView::~LLDebugView() // These have already been deleted. Fix the globals appropriately. gDebugView = NULL; gTextureView = NULL; + gTextureSizeView = NULL; } |