From 4193f9da922fd42ff6acb811c1bf302decbc6750 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Sat, 20 Dec 2014 02:21:04 +0200
Subject: Fix of build issues after merge

---
 indra/llprimitive/lldaeloader.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/llprimitive/lldaeloader.cpp')

diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index ff71d52138..80c6ff4a96 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -1286,7 +1286,9 @@ void LLDAELoader::processDomModel(LLModel* model, DAE* dae, daeElement* root, do
 						LLJoint* pJoint = mJointLookupFunc(lookingForJoint,mOpaqueData);
 						if ( pJoint )
 						{   
-							pJoint->storeCurrentXform( jointTransform.getTranslation() );												
+							LLUUID fake_mesh_id;
+							fake_mesh_id.generate();
+							pJoint->addAttachmentPosOverride( jointTransform.getTranslation(), fake_mesh_id, "");
 						}
 						else
 						{
-- 
cgit v1.2.3