diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
| commit | 6d52efe452aa8469e0343da1c7d108f3f52ab651 (patch) | |
| tree | a87be48e9840d7fc1f7ee514d7c7f994e71fdb3c /indra/newview/llmemoryview.cpp | |
| parent | 6027ad2630b8650cabcf00628ee9b0d25bedd67f (diff) | |
Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
Diffstat (limited to 'indra/newview/llmemoryview.cpp')
| -rw-r--r-- | indra/newview/llmemoryview.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llmemoryview.cpp b/indra/newview/llmemoryview.cpp index 616fabebf7..d554c272ee 100644 --- a/indra/newview/llmemoryview.cpp +++ b/indra/newview/llmemoryview.cpp @@ -107,12 +107,12 @@ BOOL LLMemoryView::handleHover(S32 x, S32 y, MASK mask) struct mtv_display_info { S32 memtype; const char *desc; - LLColor4 *color; + const LLColor4 *color; }; -static LLColor4 red0(0.5f, 0.0f, 0.0f, 1.0f); +static const LLColor4 red0(0.5f, 0.0f, 0.0f, 1.0f); -static struct mtv_display_info mtv_display_table[] = +static const struct mtv_display_info mtv_display_table[] = { { LLMemType::MTYPE_INIT, "Init", &LLColor4::white }, { LLMemType::MTYPE_STARTUP, "Startup", &LLColor4::cyan1 }, @@ -194,7 +194,6 @@ void LLMemoryView::draw() // Labels { - LLGLSTexture gls_texture; y = ytop; S32 peak = 0; for (S32 i=0; i<MTV_DISPLAY_NUM; i++) |