diff options
author | Dave Parks <davep@lindenlab.com> | 2010-06-14 23:14:14 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2010-06-14 23:14:14 -0500 |
commit | 1b7b8aa00ea4329243125a1c53c90115ff7d6bfa (patch) | |
tree | 5ef154c052e043dbc500c034b4d718c5568643d2 /indra/newview/llviewermenu.cpp | |
parent | 37a8c12bd34b2bd119b50f32d6e081ab59d1f5c4 (diff) | |
parent | 6e37ec08f678451a526f34218cb070d117cdf60a (diff) |
merge
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 b4a10d709e..d7f268eff2 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -873,6 +873,10 @@ U32 info_display_from_string(std::string info_display) { return LLPipeline::RENDER_DEBUG_SHADOW_FRUSTA; } + else if ("physics shapes" == info_display) + { + return LLPipeline::RENDER_DEBUG_PHYSICS_SHAPES; + } else if ("occlusion" == info_display) { return LLPipeline::RENDER_DEBUG_OCCLUSION; |