diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-03-20 15:23:42 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-03-20 15:23:42 -0400 |
| commit | cabb6b6a5f339a69fec25b836f46b8b470eebb90 (patch) | |
| tree | 7639aed6cb06bb0d9c3d52cb746d1c98f1120dbe /indra/newview/llviewermenu.cpp | |
| parent | 739532ee4ffdd58f9d0999901340d5476533fec2 (diff) | |
| parent | 9d9ad9a876d6498a89f9aeefc9bf258e1674dae7 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-release
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 67f6150dbe..99540ccce9 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -947,6 +947,10 @@ U32 info_display_from_string(std::string info_display) { return LLPipeline::RENDER_DEBUG_COMPOSITION; } + else if ("attachment bytes" == info_display) + { + return LLPipeline::RENDER_DEBUG_ATTACHMENT_BYTES; + } else if ("glow" == info_display) { return LLPipeline::RENDER_DEBUG_GLOW; |