summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2014-02-11 16:04:31 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2014-02-11 16:04:31 -0500
commit969cb45920c568aeebf145480b7beacb2a157bcf (patch)
tree63dfb29d5e0226b054094d88358bec6ede68c197 /indra/newview/llviewermenu.cpp
parentd8f627d8bd45cc356583e2251500c23bed836b16 (diff)
parent413be91cf5044889ade97dcbec4b17fceff122e3 (diff)
merge
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rwxr-xr-xindra/newview/llviewermenu.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 2b1c106932..e9cddb3471 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;