diff options
Diffstat (limited to 'linden/indra/newview/lldebugview.cpp')
-rw-r--r-- | linden/indra/newview/lldebugview.cpp | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/linden/indra/newview/lldebugview.cpp b/linden/indra/newview/lldebugview.cpp index 40f5202..a6d6f2d 100644 --- a/linden/indra/newview/lldebugview.cpp +++ b/linden/indra/newview/lldebugview.cpp | |||
@@ -62,7 +62,7 @@ LLDebugView::LLDebugView(const std::string& name, const LLRect &rect) | |||
62 | LLRect r; | 62 | LLRect r; |
63 | 63 | ||
64 | r.set(10, rect.getHeight() - 100, rect.getWidth()/2, 100); | 64 | r.set(10, rect.getHeight() - 100, rect.getWidth()/2, 100); |
65 | mDebugConsolep = new LLConsole("debug console", 20, r, -1, 0.f ); | 65 | mDebugConsolep = new LLConsole("debug console", r, -1, 0.f ); |
66 | mDebugConsolep->setFollowsBottom(); | 66 | mDebugConsolep->setFollowsBottom(); |
67 | mDebugConsolep->setFollowsLeft(); | 67 | mDebugConsolep->setFollowsLeft(); |
68 | mDebugConsolep->setVisible( FALSE ); | 68 | mDebugConsolep->setVisible( FALSE ); |
@@ -98,6 +98,27 @@ LLDebugView::LLDebugView(const std::string& name, const LLRect &rect) | |||
98 | addChild(gTextureView); | 98 | addChild(gTextureView); |
99 | //gTextureView->reshape(r.getWidth(), r.getHeight(), TRUE); | 99 | //gTextureView->reshape(r.getWidth(), r.getHeight(), TRUE); |
100 | 100 | ||
101 | /* | ||
102 | //there seems to be some debug code, we don't have | ||
103 | #if !LL_RELEASE_FOR_DOWNLOAD | ||
104 | r.set(150, rect.getHeight() - 50, 900 + LLImageGL::sTextureLoadedCounter.size() * 30, 100); | ||
105 | gTextureSizeView = new LLTextureSizeView("gTextureSizeView"); | ||
106 | gTextureSizeView->setRect(r); | ||
107 | gTextureSizeView->setFollowsBottom(); | ||
108 | gTextureSizeView->setFollowsLeft(); | ||
109 | addChild(gTextureSizeView); | ||
110 | |||
111 | |||
112 | r.set(150, rect.getHeight() - 50, 900 + LLImageGL::sTextureMemByCategory.size() * 30, 100); | ||
113 | gTextureCategoryView = new LLTextureSizeView("gTextureCategoryView"); | ||
114 | gTextureCategoryView->setRect(r); | ||
115 | gTextureCategoryView->setFollowsBottom(); | ||
116 | gTextureCategoryView->setFollowsLeft(); | ||
117 | gTextureCategoryView->setType(LLTextureSizeView::TEXTURE_MEM_OVER_CATEGORY); | ||
118 | addChild(gTextureCategoryView); | ||
119 | #endif | ||
120 | */ | ||
121 | |||
101 | const S32 VELOCITY_LEFT = 10; // 370; | 122 | const S32 VELOCITY_LEFT = 10; // 370; |
102 | const S32 VELOCITY_WIDTH = 500; | 123 | const S32 VELOCITY_WIDTH = 500; |
103 | const S32 VELOCITY_TOP = 140; | 124 | const S32 VELOCITY_TOP = 140; |
@@ -115,5 +136,6 @@ LLDebugView::~LLDebugView() | |||
115 | // These have already been deleted. Fix the globals appropriately. | 136 | // These have already been deleted. Fix the globals appropriately. |
116 | gDebugView = NULL; | 137 | gDebugView = NULL; |
117 | gTextureView = NULL; | 138 | gTextureView = NULL; |
139 | gTextureSizeView = NULL; | ||
118 | } | 140 | } |
119 | 141 | ||