diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-09-30 21:44:20 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-09-30 21:44:20 -0400 |
| commit | 57969e41db06cbc5c0f9ffdeafb7c21e55b2731d (patch) | |
| tree | ea54edd04380696ef3f83671204fdae2f7ae298e /indra/newview/lldebugview.cpp | |
| parent | c4c537e957458650a2948ffbd3a787f007d87f7a (diff) | |
| parent | eca30a22626b9a3e68e0e55f8da75614cd60d713 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/login-api/
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; } |