diff options
Diffstat (limited to 'linden/indra/newview/llmemoryview.cpp')
-rw-r--r-- | linden/indra/newview/llmemoryview.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/linden/indra/newview/llmemoryview.cpp b/linden/indra/newview/llmemoryview.cpp index 40b5387..c6db748 100644 --- a/linden/indra/newview/llmemoryview.cpp +++ b/linden/indra/newview/llmemoryview.cpp | |||
@@ -107,12 +107,12 @@ BOOL LLMemoryView::handleHover(S32 x, S32 y, MASK mask) | |||
107 | struct mtv_display_info { | 107 | struct mtv_display_info { |
108 | S32 memtype; | 108 | S32 memtype; |
109 | const char *desc; | 109 | const char *desc; |
110 | LLColor4 *color; | 110 | const LLColor4 *color; |
111 | }; | 111 | }; |
112 | 112 | ||
113 | static LLColor4 red0(0.5f, 0.0f, 0.0f, 1.0f); | 113 | static const LLColor4 red0(0.5f, 0.0f, 0.0f, 1.0f); |
114 | 114 | ||
115 | static struct mtv_display_info mtv_display_table[] = | 115 | static const struct mtv_display_info mtv_display_table[] = |
116 | { | 116 | { |
117 | { LLMemType::MTYPE_INIT, "Init", &LLColor4::white }, | 117 | { LLMemType::MTYPE_INIT, "Init", &LLColor4::white }, |
118 | { LLMemType::MTYPE_STARTUP, "Startup", &LLColor4::cyan1 }, | 118 | { LLMemType::MTYPE_STARTUP, "Startup", &LLColor4::cyan1 }, |
@@ -147,8 +147,8 @@ static const int MTV_DISPLAY_NUM = (sizeof(mtv_display_table)/sizeof(mtv_displa | |||
147 | void LLMemoryView::draw() | 147 | void LLMemoryView::draw() |
148 | { | 148 | { |
149 | std::string tdesc; | 149 | std::string tdesc; |
150 | S32 width = mRect.getWidth(); | 150 | S32 width = getRect().getWidth(); |
151 | S32 height = mRect.getHeight(); | 151 | S32 height = getRect().getHeight(); |
152 | 152 | ||
153 | LLGLSUIDefault gls_ui; | 153 | LLGLSUIDefault gls_ui; |
154 | LLGLSNoTexture gls_no_tex; | 154 | LLGLSNoTexture gls_no_tex; |
@@ -194,7 +194,6 @@ void LLMemoryView::draw() | |||
194 | 194 | ||
195 | // Labels | 195 | // Labels |
196 | { | 196 | { |
197 | LLGLSTexture gls_texture; | ||
198 | y = ytop; | 197 | y = ytop; |
199 | S32 peak = 0; | 198 | S32 peak = 0; |
200 | for (S32 i=0; i<MTV_DISPLAY_NUM; i++) | 199 | for (S32 i=0; i<MTV_DISPLAY_NUM; i++) |