From 2816e8f11403965344699cf7f834d155387b5d99 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 28 Oct 2014 15:32:23 -0700
Subject: [PATCH] fix location DataWebDialog missing InterfaceLocation object

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

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 274afd4bca..0bebe06b1c 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -1315,7 +1315,7 @@ void Menu::displayNameLocationResponse(const QString& errorString) {
 void Menu::toggleLocationList() {
     if (!_userLocationsDialog) {
         JavascriptObjectMap locationObjectMap;
-        locationObjectMap.insert("InterfaceLocation", LocationScriptingInterface::getInstance());
+        locationObjectMap.insert("InterfaceLocation", &AddressManager::getInstance());
         _userLocationsDialog = DataWebDialog::dialogForPath("/user/locations", locationObjectMap);
     }
     
@@ -1359,7 +1359,7 @@ void Menu::nameLocation() {
     
     if (!_newLocationDialog) {
         JavascriptObjectMap locationObjectMap;
-        locationObjectMap.insert("InterfaceLocation", LocationScriptingInterface::getInstance());
+        locationObjectMap.insert("InterfaceLocation", &AddressManager::getInstance());
         _newLocationDialog = DataWebDialog::dialogForPath("/user/locations/new", locationObjectMap);
     }
     
diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp
index 1201a8973f..b4765dc362 100644
--- a/libraries/networking/src/AddressManager.cpp
+++ b/libraries/networking/src/AddressManager.cpp
@@ -71,6 +71,10 @@ const QString AddressManager::currentPath(bool withOrientation) const {
     }
 }
 
+QString AddressManager::getDomainID() const {
+    return NodeList::getInstance()->getDomainHandler().getUUID().toString();
+}
+
 const JSONCallbackParameters& AddressManager::apiCallbackParameters() {
     static bool hasSetupParameters = false;
     static JSONCallbackParameters callbackParams;
diff --git a/libraries/networking/src/AddressManager.h b/libraries/networking/src/AddressManager.h
index 8a25464223..d6ecdc9fc6 100644
--- a/libraries/networking/src/AddressManager.h
+++ b/libraries/networking/src/AddressManager.h
@@ -31,6 +31,7 @@ class AddressManager : public QObject {
     Q_PROPERTY(QString protocol READ getProtocol)
     Q_PROPERTY(QString hostname READ getCurrentDomain)
     Q_PROPERTY(QString pathname READ currentPath)
+    Q_PROPERTY(QString domainID READ getDomainID)
 public:
     static AddressManager& getInstance();
     
@@ -41,6 +42,7 @@ public:
     const QString currentPath(bool withOrientation = true) const;
     
     const QString& getCurrentDomain() const { return _currentDomain; }
+    QString getDomainID() const;
     
     void attemptPlaceNameLookup(const QString& lookupString);