From 32e330320e0e50d84d8d7bb1a03d0831732fcb17 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Mon, 16 Jan 2017 11:26:57 -0800
Subject: [PATCH] Cleanup after rebase

---
 interface/resources/qml/hifi/NameCard.qml | 17 ++++++++++++-----
 interface/resources/qml/hifi/Pal.qml      |  8 --------
 libraries/avatars/src/AvatarData.cpp      |  2 +-
 scripts/system/pal.js                     |  1 -
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/interface/resources/qml/hifi/NameCard.qml b/interface/resources/qml/hifi/NameCard.qml
index 250dad7f7f..b389891255 100644
--- a/interface/resources/qml/hifi/NameCard.qml
+++ b/interface/resources/qml/hifi/NameCard.qml
@@ -60,11 +60,15 @@ Item {
         Rectangle {
             id: myDisplayName
             visible: isMyCard
-            color: "#C5C5C5"
-            anchors.left: parent.left
-            anchors.leftMargin: -10
+            // Size
             width: parent.width + 70
             height: 35
+            // Anchors
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.leftMargin: -10
+            // Style
+            color: "#C5C5C5"
             border.color: hifi.colors.blueHighlight
             border.width: 0
             TextInput {
@@ -126,7 +130,10 @@ Item {
         }
         // Spacer for DisplayName for my card
         Rectangle {
+            id: myDisplayNameSpacer
             width: myDisplayName.width
+            // Anchors
+            anchors.top: myDisplayName.bottom
             height: 5
             visible: isMyCard
             opacity: 0
@@ -160,7 +167,7 @@ Item {
             // Size
             width: parent.width
             // Anchors
-            anchors.top: displayNameText.bottom
+            anchors.top: isMyCard ? myDisplayNameSpacer.bottom : displayNameText.bottom
             // Text Size
             size: thisNameCard.usernameTextHeight
             // Text Positioning
@@ -182,7 +189,7 @@ Item {
         Rectangle {
             id: nameCardVUMeter
             // Size
-            width: ((gainSlider.value - gainSlider.minimumValue)/(gainSlider.maximumValue - gainSlider.minimumValue)) * parent.width
+            width: isMyCard ? gainSlider.width : ((gainSlider.value - gainSlider.minimumValue)/(gainSlider.maximumValue - gainSlider.minimumValue)) * parent.width
             height: 8
             // Anchors
             anchors.top: spacer.bottom
diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index 8fa8fe8514..68ad3f811c 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -346,11 +346,6 @@ Rectangle {
         visible: iAmAdmin
         color: hifi.colors.lightGrayText
     }
-    function letterbox(message) {
-        letterboxMessage.text = message;
-        letterboxMessage.visible = true
-
-    }
     // This Rectangle refers to the [?] popup button next to "NAMES"
     Rectangle {
         color: hifi.colors.tableBackgroundLight
@@ -411,9 +406,6 @@ Rectangle {
             onExited: adminHelpText.color = hifi.colors.redHighlight
         }
     }
-    LetterboxMessage {
-        id: letterboxMessage
-    }
     }
 
     function findSessionIndex(sessionId, optionalData) { // no findIndex in .qml
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index 0381363ef3..0350e73d2e 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -1094,7 +1094,7 @@ void AvatarData::setSkeletonModelURL(const QUrl& skeletonModelURL) {
 
 void AvatarData::setDisplayName(const QString& displayName) {
     _displayName = displayName;
-    DependencyManager::get<NodeList>()->killNodeWithUUID(getSessionUUID());
+    DependencyManager::get<NodeList>()->getDomainHandler().softReset();
 
     qCDebug(avatars) << "Changing display name for avatar to" << displayName;
 }
diff --git a/scripts/system/pal.js b/scripts/system/pal.js
index c6ac1056de..6fd386b00f 100644
--- a/scripts/system/pal.js
+++ b/scripts/system/pal.js
@@ -242,7 +242,6 @@ pal.fromQml.connect(function (message) { // messages are {method, params}, like
             MyAvatar.displayName = message.params;
         }
         break;
-    default:
     default:
         print('Unrecognized message from Pal.qml:', JSON.stringify(message));
     }