From f10404b31e8d3edb1e867f5bf87ed2bc639976bb Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 6 Feb 2014 11:45:37 -0800
Subject: [PATCH] allow setting of avatar URLs via AvatarData properties

---
 libraries/avatars/src/AvatarData.h            |  2 ++
 .../src/DataServerScriptingInterface.cpp      | 21 ----------------
 .../src/DataServerScriptingInterface.h        | 25 -------------------
 libraries/script-engine/src/ScriptEngine.cpp  |  2 --
 libraries/script-engine/src/ScriptEngine.h    |  5 ----
 5 files changed, 2 insertions(+), 53 deletions(-)
 delete mode 100644 libraries/script-engine/src/DataServerScriptingInterface.cpp
 delete mode 100644 libraries/script-engine/src/DataServerScriptingInterface.h

diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index 56d345ce75..a08441fb93 100755
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -74,6 +74,8 @@ class AvatarData : public NodeData {
     Q_PROPERTY(glm::quat orientation READ getOrientation WRITE setOrientation)
     Q_PROPERTY(float headPitch READ getHeadPitch WRITE setHeadPitch)
     
+    Q_PROPERTY(QUrl faceModelURL READ getFaceModelURL WRITE setFaceModelURL)
+    Q_PROPERTY(QURl skeletonModelURL READ getSkeletonModelURL WRITE setSkeletonModelURL)
 public:
     AvatarData();
     ~AvatarData();
diff --git a/libraries/script-engine/src/DataServerScriptingInterface.cpp b/libraries/script-engine/src/DataServerScriptingInterface.cpp
deleted file mode 100644
index 04efed2bce..0000000000
--- a/libraries/script-engine/src/DataServerScriptingInterface.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-//  DataServerScriptingInterface.cpp
-//  hifi
-//
-//  Created by Stephen Birarda on 1/20/2014.
-//  Copyright (c) 2014 HighFidelity, Inc. All rights reserved.
-//
-
-#include <DataServerClient.h>
-#include <NodeList.h>
-
-#include "DataServerScriptingInterface.h"
-
-DataServerScriptingInterface::DataServerScriptingInterface()
-{
-    
-}
-
-void DataServerScriptingInterface::setValueForKey(const QString& key, const QString& value) {
-    DataServerClient::putValueForKeyAndUUID(key, value, NodeList::getInstance()->getSessionUUID());
-}
\ No newline at end of file
diff --git a/libraries/script-engine/src/DataServerScriptingInterface.h b/libraries/script-engine/src/DataServerScriptingInterface.h
deleted file mode 100644
index b46c0bda7a..0000000000
--- a/libraries/script-engine/src/DataServerScriptingInterface.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-//  DataServerScriptingInterface.h
-//  hifi
-//
-//  Created by Stephen Birarda on 1/20/2014.
-//  Copyright (c) 2014 HighFidelity, Inc. All rights reserved.
-//
-
-#ifndef __hifi__DataServerScriptingInterface__
-#define __hifi__DataServerScriptingInterface__
-
-#include <QtCore/QObject>
-#include <QtCore/QUuid>
-#include <QtScript/QScriptValue>
-
-class DataServerScriptingInterface : public QObject {
-    Q_OBJECT
-public:
-    DataServerScriptingInterface();
-    
-public slots:
-    void setValueForKey(const QString& key, const QString& value);
-};
-
-#endif /* defined(__hifi__DataServerScriptingInterface__) */
diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index b3b0736114..e428975024 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -44,7 +44,6 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, co
                            AbstractMenuInterface* menu,
                            AbstractControllerScriptingInterface* controllerScriptingInterface) :
     _isAvatar(false),
-    _dataServerScriptingInterface(),
     _avatarData(NULL)
 {
     _scriptContents = scriptContents;
@@ -137,7 +136,6 @@ void ScriptEngine::init() {
     registerGlobalObject("Script", this);
     registerGlobalObject("Audio", &_audioScriptingInterface);
     registerGlobalObject("Controller", _controllerScriptingInterface);
-    registerGlobalObject("Data", &_dataServerScriptingInterface);
     registerGlobalObject("Particles", &_particlesScriptingInterface);
     registerGlobalObject("Quat", &_quatLibrary);
 
diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h
index 98d5860332..5a6864b12f 100644
--- a/libraries/script-engine/src/ScriptEngine.h
+++ b/libraries/script-engine/src/ScriptEngine.h
@@ -24,7 +24,6 @@
 class ParticlesScriptingInterface;
 
 #include "AbstractControllerScriptingInterface.h"
-#include "DataServerScriptingInterface.h"
 #include "Quat.h"
 
 const QString NO_SCRIPT("");
@@ -43,9 +42,6 @@ public:
 
     /// Access the ParticlesScriptingInterface in order to initialize it with a custom packet sender and jurisdiction listener
     static ParticlesScriptingInterface* getParticlesScriptingInterface() { return &_particlesScriptingInterface; }
-    
-    /// Access the DataServerScriptingInterface for access to its underlying UUID
-    const DataServerScriptingInterface& getDataServerScriptingInterface() { return _dataServerScriptingInterface; }
 
     /// sets the script contents, will return false if failed, will fail if script is already running
     bool setScriptContents(const QString& scriptContents);
@@ -97,7 +93,6 @@ private:
     static ParticlesScriptingInterface _particlesScriptingInterface;
     AbstractControllerScriptingInterface* _controllerScriptingInterface;
     AudioScriptingInterface _audioScriptingInterface;
-    DataServerScriptingInterface _dataServerScriptingInterface;
     AvatarData* _avatarData;
     bool _wantMenuItems;
     QString _scriptMenuName;