summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorTank_Master <tank.master@phoenixviewer.com>2014-03-10 12:07:59 -0700
committerTank_Master <tank.master@phoenixviewer.com>2014-03-10 12:07:59 -0700
commit328f64b4b9b870661a6d0bb8947dc1ff410ca0f8 (patch)
tree769bd24c2300307846e316e230db5dadb641611a /indra/newview/llviewermenu.cpp
parent061eee57d9a56bd50fbe2a8f84b3cff99f63ebfc (diff)
parent1ad94b5a9a8d0b6d095938148cbf8b1b56a778bf (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 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;