From 6db6d81b0a90fe7b48a3ccf64ba768e5772397c8 Mon Sep 17 00:00:00 2001
From: Eric Tulla <tulla@lindenlab.com>
Date: Thu, 5 Mar 2009 00:29:27 +0000
Subject: Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272). No
 conflicts in the merge.

Result of:
svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
---
 indra/newview/llviewerjoint.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'indra/newview/llviewerjoint.cpp')

diff --git a/indra/newview/llviewerjoint.cpp b/indra/newview/llviewerjoint.cpp
index 89490e08bf..1cc062dbd2 100644
--- a/indra/newview/llviewerjoint.cpp
+++ b/indra/newview/llviewerjoint.cpp
@@ -514,6 +514,16 @@ void LLViewerJoint::setVisible(BOOL visible, BOOL recursive)
 	}
 }
 
+
+void LLViewerJoint::setMeshesToChildren()
+{
+	removeAllChildren();
+	for (std::vector<LLViewerJointMesh*>::iterator iter = mMeshParts.begin();
+		iter != mMeshParts.end(); iter++)
+	{
+		addChild((LLViewerJointMesh *) *iter);
+	}
+}
 //-----------------------------------------------------------------------------
 // LLViewerJointCollisionVolume()
 //-----------------------------------------------------------------------------
-- 
cgit v1.2.3