From 47643e1efee6c649d7b7d6a678aff244a927c5cb Mon Sep 17 00:00:00 2001
From: Thijs Wenker <me@thoys.nl>
Date: Wed, 21 Jun 2017 06:31:36 +0200
Subject: [PATCH 1/2] Expose location API to Agent scripts (side-effect, agents
 now can teleport)

---
 assignment-client/src/Agent.cpp                               | 4 ++++
 interface/src/Application.cpp                                 | 2 +-
 .../networking/src}/LocationScriptingInterface.cpp            | 0
 .../networking/src}/LocationScriptingInterface.h              | 0
 4 files changed, 5 insertions(+), 1 deletion(-)
 rename {interface/src/scripting => libraries/networking/src}/LocationScriptingInterface.cpp (100%)
 rename {interface/src/scripting => libraries/networking/src}/LocationScriptingInterface.h (100%)

diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index 1dc3aefb61..260a6d6825 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -23,6 +23,7 @@
 #include <AvatarHashMap.h>
 #include <AudioInjectorManager.h>
 #include <AssetClient.h>
+#include <LocationScriptingInterface.h>
 #include <MessagesClient.h>
 #include <NetworkAccessManager.h>
 #include <NodeList.h>
@@ -453,6 +454,9 @@ void Agent::executeScript() {
 
     _scriptEngine->registerGlobalObject("EntityViewer", &_entityViewer);
 
+    _scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter,
+        LocationScriptingInterface::locationSetter);
+
     auto recordingInterface = DependencyManager::get<RecordingScriptingInterface>();
     _scriptEngine->registerGlobalObject("Recording", recordingInterface.data());
 
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 71c4657264..46f109b378 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -88,6 +88,7 @@
 #include <UserActivityLoggerScriptingInterface.h>
 #include <LogHandler.h>
 #include "LocationBookmarks.h"
+#include <LocationScriptingInterface.h>
 #include <MainWindow.h>
 #include <MappingRequest.h>
 #include <MessagesClient.h>
@@ -159,7 +160,6 @@
 #include "scripting/DesktopScriptingInterface.h"
 #include "scripting/GlobalServicesScriptingInterface.h"
 #include "scripting/HMDScriptingInterface.h"
-#include "scripting/LocationScriptingInterface.h"
 #include "scripting/MenuScriptingInterface.h"
 #include "scripting/SettingsScriptingInterface.h"
 #include "scripting/WindowScriptingInterface.h"
diff --git a/interface/src/scripting/LocationScriptingInterface.cpp b/libraries/networking/src/LocationScriptingInterface.cpp
similarity index 100%
rename from interface/src/scripting/LocationScriptingInterface.cpp
rename to libraries/networking/src/LocationScriptingInterface.cpp
diff --git a/interface/src/scripting/LocationScriptingInterface.h b/libraries/networking/src/LocationScriptingInterface.h
similarity index 100%
rename from interface/src/scripting/LocationScriptingInterface.h
rename to libraries/networking/src/LocationScriptingInterface.h

From 2a4e9cb6037315040be6938bdb1e868cb707ca20 Mon Sep 17 00:00:00 2001
From: Thijs Wenker <me@thoys.nl>
Date: Wed, 21 Jun 2017 06:38:16 +0200
Subject: [PATCH 2/2] fix local include / headers

---
 libraries/networking/src/LocationScriptingInterface.cpp | 4 ++--
 libraries/networking/src/LocationScriptingInterface.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/networking/src/LocationScriptingInterface.cpp b/libraries/networking/src/LocationScriptingInterface.cpp
index c0a9a62ff3..aae1da73ba 100644
--- a/libraries/networking/src/LocationScriptingInterface.cpp
+++ b/libraries/networking/src/LocationScriptingInterface.cpp
@@ -1,6 +1,6 @@
 //
 //  LocationScriptingInterface.cpp
-//  interface/src/scripting
+//  libraries/networking/src
 //
 //  Created by Ryan Huffman on 4/29/14.
 //  Copyright 2014 High Fidelity, Inc.
@@ -9,7 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <AddressManager.h>
+#include "AddressManager.h"
 
 #include "LocationScriptingInterface.h"
 
diff --git a/libraries/networking/src/LocationScriptingInterface.h b/libraries/networking/src/LocationScriptingInterface.h
index 18390aa1b3..987c4ccd0d 100644
--- a/libraries/networking/src/LocationScriptingInterface.h
+++ b/libraries/networking/src/LocationScriptingInterface.h
@@ -1,6 +1,6 @@
 //
 //  LocationScriptingInterface.h
-//  interface/src/scripting
+//  libraries/networking/src
 //
 //  Created by Ryan Huffman on 4/29/14.
 //  Copyright 2014 High Fidelity, Inc.