From d932ba74fd75ef2244a165ad76c5e182fd9d4d67 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 12 Nov 2015 17:58:12 -0800
Subject: [PATCH] remove the avatar kill packet from Interface

---
 interface/src/Application.cpp     | 5 +----
 interface/src/avatar/MyAvatar.cpp | 5 -----
 interface/src/avatar/MyAvatar.h   | 2 --
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 2679d4b5ec..f8d958c82e 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -836,7 +836,7 @@ void Application::cleanupBeforeQuit() {
     
     auto nodeList = DependencyManager::get<NodeList>();
     
-    // send the domain a disconnect packet
+    // send the domain a disconnect packet, force a clear of the IP so we can't
     nodeList->getDomainHandler().disconnect();
     
     // tell the packet receiver we're shutting down, so it can drop packets
@@ -860,9 +860,6 @@ void Application::cleanupBeforeQuit() {
     saveSettings();
     _window->saveGeometry();
 
-    // let the avatar mixer know we're out
-    MyAvatar::sendKillAvatar();
-
     // stop the AudioClient
     QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(),
                               "stop", Qt::BlockingQueuedConnection);
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 852e1d1389..a59b26b51a 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1024,11 +1024,6 @@ int MyAvatar::parseDataFromBuffer(const QByteArray& buffer) {
     return buffer.size();
 }
 
-void MyAvatar::sendKillAvatar() {
-    auto killPacket = NLPacket::create(PacketType::KillAvatar, 0);
-    DependencyManager::get<NodeList>()->broadcastToNodes(std::move(killPacket), NodeSet() << NodeType::AvatarMixer);
-}
-
 void MyAvatar::updateLookAtTargetAvatar() {
     //
     //  Look at the avatar whose eyes are closest to the ray in direction of my avatar's head
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 52f1ffce3f..bb5fd0cf0a 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -162,8 +162,6 @@ public:
 
     eyeContactTarget getEyeContactTarget();
 
-    static void sendKillAvatar();
-
     Q_INVOKABLE glm::vec3 getTrackedHeadPosition() const { return _trackedHeadPosition; }
     Q_INVOKABLE glm::vec3 getHeadPosition() const { return getHead()->getPosition(); }
     Q_INVOKABLE float getHeadFinalYaw() const { return getHead()->getFinalYaw(); }