From ef32853d4666ad29afc35cb6e351138b302cd0a3 Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Tue, 1 Dec 2015 11:51:22 -0800
Subject: [PATCH] When AvatarData parses the .fst, store the (merged) .fbx
 filename.   (Interface gets the .fbx by a separate path, but agents don't
 have that chance.)

---
 libraries/avatars/src/AvatarData.cpp | 9 ++++++++-
 libraries/avatars/src/AvatarData.h   | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index 0f588b5013..e25e4f243f 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -1212,7 +1212,14 @@ void AvatarData::setJointMappingsFromNetworkReply() {
 
     QByteArray line;
     while (!(line = networkReply->readLine()).isEmpty()) {
-        if (!(line = line.trimmed()).startsWith("jointIndex")) {
+        line = line.trimmed();
+        if (line.startsWith("filename")) {
+            int filenameIndex = line.indexOf('=') + 1;
+                if (filenameIndex > 0) {
+                    _skeletonFBXURL = _skeletonModelURL.resolved(QString(line.mid(filenameIndex).trimmed()));
+                }
+            }
+        if (!line.startsWith("jointIndex")) {
             continue;
         }
         int jointNameIndex = line.indexOf('=') + 1;
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index bc71bc52cd..2d5a395e2a 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -392,6 +392,7 @@ protected:
 
     QUrl _faceModelURL; // These need to be empty so that on first time setting them they will not short circuit
     QUrl _skeletonModelURL; // These need to be empty so that on first time setting them they will not short circuit
+    QUrl _skeletonFBXURL;
     QVector<AttachmentData> _attachmentData;
     QString _displayName;