summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-21 15:29:40 -0500
committerOz Linden <oz@lindenlab.com>2011-01-21 15:29:40 -0500
commit790dfe7556a476b502ef3a0ea921efdd11735f28 (patch)
tree3db004c2acdfcf32f01abbf284e6dbd67c61a4c8 /indra/newview/llviewermenu.cpp
parent6a3d06deca73683514d4668f78adf684d760708c (diff)
parent4652e26196ed43e3a2fdd5bbb2e6c4b6b8466719 (diff)
merge changes for storm-844
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r--indra/newview/llviewermenu.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 60b118284b..7cc04e0338 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -906,6 +906,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;