SL-271 WIP - color base and extended bones differently.

3 files changed, 18 insertions, 14 deletions

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 7d38cd116d..cf49cd2589 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -1382,6 +1382,7 @@ void LLVOAvatar::renderBones()
 		ostr << jointp->getName() << ", ";
 
 		jointp->updateWorldMatrix();
+        LLJoint::SupportCategory sc = jointp->getSupport();
 
 		gGL.pushMatrix();
 		gGL.multMatrix( &jointp->getXform()->getWorldMatrix().mMatrix[0][0] );
@@ -1398,7 +1399,15 @@ void LLVOAvatar::renderBones()
         LLGLDepthTest normal_depth(GL_TRUE);
 
         // Unoccluded bone portions
-		gGL.diffuseColor3f( 1.f, 1.f, 1.f );
+        if (sc == LLJoint::SupportCategory::SUPPORT_BASE)
+        {
+            gGL.diffuseColor3f( 1.0f, 0.5f, 0.5f );
+        }
+        else
+        {
+            gGL.diffuseColor3f( 0.5f, 1.0f, 0.5f );
+        }
+        
 	
 		gGL.vertex3fv(v[0].mV); 
 		gGL.vertex3fv(v[1].mV);
@@ -1406,7 +1415,14 @@ void LLVOAvatar::renderBones()
         LLGLDepthTest depth_under(GL_TRUE, GL_FALSE, GL_GREATER);
 
         // Unoccluded bone portions
-		gGL.diffuseColor3f( 1.0f, 0.f, 0.0f );
+		if (sc == LLJoint::SupportCategory::SUPPORT_BASE)
+        {
+            gGL.diffuseColor3f( 1.0f, 0.0f, 0.0f );
+        }
+        else
+        {
+            gGL.diffuseColor3f( 0.0f, 1.0f, 0.0f );
+        }
 
 		gGL.vertex3fv(v[0].mV); 
 		gGL.vertex3fv(v[1].mV);
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index c1ca0aed69..86084d5025 100755
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -232,7 +232,6 @@ void LLVOAvatarSelf::initInstance()
 	{
 		mDebugBakedTextureTimes[i][0] = -1.0f;
 		mDebugBakedTextureTimes[i][1] = -1.0f;
-		mInitialBakeIDs[i] = LLUUID::null;
 	}
 
 	status &= buildMenus();
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h
index 257a760eeb..c9c899afd6 100755
--- a/indra/newview/llvoavatarself.h
+++ b/indra/newview/llvoavatarself.h
@@ -101,17 +101,6 @@ private:
 	// helper function. Passed in param is assumed to be in avatar's parameter list.
 	BOOL setParamWeight(const LLViewerVisualParam *param, F32 weight);
 
-
-
-/**                    Initialization
- **                                                                            **
- *******************************************************************************/
-
-private:
-	LLUUID mInitialBakeIDs[6];
-	//bool mInitialBakesLoaded;
-
-
 /********************************************************************************
  **                                                                            **
  **                    STATE