diff options
| author | simon <none@none> | 2014-02-10 15:42:25 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-02-10 15:42:25 -0800 |
| commit | 4acc2dc2736621952b6ee0e808640dcf79e341c6 (patch) | |
| tree | 9decb3ccc69bfee8fcaeb583bf0c6f6afd7b1243 /indra/newview/llviewermenu.cpp | |
| parent | 1be85e1a0a2a2d607c74acb684412b6c3b307e6f (diff) | |
| parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) | |
Merge viewer-release
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 8a238379f6..c7c8da27f3 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; |