Merge branch 'master' into DRTVWR-516-maint

1 files changed, 17 insertions, 4 deletions

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 652fdc993b..5a1d6e4271 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -1578,13 +1578,16 @@ void LLVOAvatar::renderCollisionVolumes()
 	}
 }
 
-void LLVOAvatar::renderBones()
+void LLVOAvatar::renderBones(const std::string &selected_joint)
 {
     LLGLEnable blend(GL_BLEND);
 
 	avatar_joint_list_t::iterator iter = mSkeleton.begin();
-	avatar_joint_list_t::iterator end  = mSkeleton.end();
+    avatar_joint_list_t::iterator end = mSkeleton.end();
 
+    // For selected joints
+    static LLVector3 SELECTED_COLOR_OCCLUDED(1.0f, 1.0f, 0.0f);
+    static LLVector3 SELECTED_COLOR_VISIBLE(0.5f, 0.5f, 0.5f);
     // For bones with position overrides defined
     static LLVector3 OVERRIDE_COLOR_OCCLUDED(1.0f, 0.0f, 0.0f);
     static LLVector3 OVERRIDE_COLOR_VISIBLE(0.5f, 0.5f, 0.5f);
@@ -1611,7 +1614,18 @@ void LLVOAvatar::renderBones()
 
         LLVector3 pos;
         LLUUID mesh_id;
-        if (jointp->hasAttachmentPosOverride(pos,mesh_id))
+        F32 sphere_scale = SPHERE_SCALEF;
+
+        // We are in render, so it is preferable to implement selection
+        // in a different way, but since this is for debug/preview, this
+        // is low priority
+        if (jointp->getName() == selected_joint)
+        {
+            sphere_scale *= 16;
+            occ_color = SELECTED_COLOR_OCCLUDED;
+            visible_color = SELECTED_COLOR_VISIBLE;
+        }
+        else if (jointp->hasAttachmentPosOverride(pos,mesh_id))
         {
             occ_color = OVERRIDE_COLOR_OCCLUDED;
             visible_color = OVERRIDE_COLOR_VISIBLE;
@@ -1632,7 +1646,6 @@ void LLVOAvatar::renderBones()
         LLVector3 begin_pos(0,0,0);
         LLVector3 end_pos(jointp->getEnd());
 
-        F32 sphere_scale = SPHERE_SCALEF;
         
 		gGL.pushMatrix();
 		gGL.multMatrix( &jointp->getXform()->getWorldMatrix().mMatrix[0][0] );