From b3821bb02d5d8919004e482e0ab90b3a4a00bad1 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 16 Mar 2017 12:56:54 -0700
Subject: [PATCH] fix location vs AddressManager woes

---
 interface/resources/qml/hifi/NameCard.qml | 2 +-
 interface/src/Application.cpp             | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/interface/resources/qml/hifi/NameCard.qml b/interface/resources/qml/hifi/NameCard.qml
index 9f73d1090e..d43cf90386 100644
--- a/interface/resources/qml/hifi/NameCard.qml
+++ b/interface/resources/qml/hifi/NameCard.qml
@@ -27,7 +27,7 @@ Item {
 
     // Properties
     property string profileUrl: "";
-    property string defaultBaseUrl: location.metaverseServerUrl;
+    property string defaultBaseUrl: AddressManager.metaverseServerUrl;
     property string connectionStatus : ""
     property string uuid: ""
     property string displayName: ""
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 9c86c4b8c6..1bb4c64884 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2011,7 +2011,6 @@ void Application::initializeUi() {
     rootContext->setContextProperty("Scene", DependencyManager::get<SceneScriptingInterface>().data());
     rootContext->setContextProperty("Render", _renderEngine->getConfiguration().get());
     rootContext->setContextProperty("Reticle", getApplicationCompositor().getReticleInterface());
-    rootContext->setContextProperty("location", DependencyManager::get<AddressManager>().data());
 
     rootContext->setContextProperty("ApplicationCompositor", &getApplicationCompositor());