From 6c49db0f1baa030161195246876ded895e029d9c Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 10 Apr 2017 19:16:07 -0700
Subject: [PATCH] add missing include for qScriptRegisterMetaType in Agent

---
 assignment-client/src/Agent.cpp                | 5 +++--
 libraries/script-engine/src/ScriptAvatarData.h | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index b49a47a071..d0a261c208 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -28,9 +28,10 @@
 #include <NodeList.h>
 #include <udt/PacketHeaders.h>
 #include <ResourceCache.h>
+#include <ScriptAvatarData.h>
 #include <ScriptCache.h>
-#include <SoundCache.h>
 #include <ScriptEngines.h>
+#include <SoundCache.h>
 #include <UUID.h>
 
 #include <recording/Deck.h>
@@ -344,7 +345,7 @@ void Agent::executeScript() {
     _scriptEngine->registerGlobalObject("Avatar", scriptedAvatar.data());
 
     // register meta types for retrieval of ScriptAvatarData objects
-    qScriptRegisterMetaType(_scriptEngine, avatarDataToScriptValue, avatarDataFromScriptValue);
+    qScriptRegisterMetaType(_scriptEngine.get(), avatarDataToScriptValue, avatarDataFromScriptValue);
 
     auto player = DependencyManager::get<recording::Deck>();
     connect(player.data(), &recording::Deck::playbackStateChanged, [=] {
diff --git a/libraries/script-engine/src/ScriptAvatarData.h b/libraries/script-engine/src/ScriptAvatarData.h
index 211989fa45..23b2667bcc 100644
--- a/libraries/script-engine/src/ScriptAvatarData.h
+++ b/libraries/script-engine/src/ScriptAvatarData.h
@@ -136,7 +136,7 @@ private:
 
 Q_DECLARE_METATYPE(AvatarSharedPointer)
 
-QScriptValue avatarToScriptValue(QScriptEngine* engine, const AvatarSharedPointer& in);
-void avatarFromScriptValue(const QScriptValue& object, AvatarSharedPointer& out);
+QScriptValue avatarDataToScriptValue(QScriptEngine* engine, const AvatarSharedPointer& in);
+void avatarDataFromScriptValue(const QScriptValue& object, AvatarSharedPointer& out);
 
 #endif // hifi_ScriptAvatarData_h