diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-01-14 14:16:07 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-01-14 14:16:07 -0500 |
commit | d82da834fa4026f2912406e9d39196ec7287f785 (patch) | |
tree | 173094ca3fc90abbea3686d274c8a2dcb7adabd6 /indra/newview/llviewermenu.cpp | |
parent | 584c7ecb4ed02e9ab039c6254ffc33331c31058c (diff) | |
parent | 939e8d8f74687e7cb857c55bb6a8082226f1202b (diff) |
Automated merge up from viewer-development
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 0f980986d3..a152ab4aa0 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -913,6 +913,10 @@ U32 info_display_from_string(std::string info_display) { return LLPipeline::RENDER_DEBUG_BATCH_SIZE; } + else if ("update type" == info_display) + { + return LLPipeline::RENDER_DEBUG_UPDATE_TYPE; + } else if ("texture anim" == info_display) { return LLPipeline::RENDER_DEBUG_TEXTURE_ANIM; |