diff options
| author | Baker Linden <baker@lindenlab.com> | 2014-02-11 15:37:51 -0800 |
|---|---|---|
| committer | Baker Linden <baker@lindenlab.com> | 2014-02-11 15:37:51 -0800 |
| commit | 6580df1ed745b8d5b782fb4bfb9bf7b86660b103 (patch) | |
| tree | 314d81e8b63d4e109e6494e92996a26e1f5910e2 /indra/newview/llviewermenu.cpp | |
| parent | c894c53449ee7ed096e3ecdcf5c1f32cecb392ba (diff) | |
| parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) | |
viewer-release merge
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rwxr-xr-x | 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 ac2940fcfc..fb07ab8fbe 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -1025,6 +1025,10 @@ U32 info_display_from_string(std::string info_display) { return LLPipeline::RENDER_DEBUG_AVATAR_VOLUME; } + else if ("joints" == info_display) + { + return LLPipeline::RENDER_DEBUG_AVATAR_JOINTS; + } else if ("raycast" == info_display) { return LLPipeline::RENDER_DEBUG_RAYCAST; |