From a6a48aafdc950e79f1e7a638b823ec388c440ba3 Mon Sep 17 00:00:00 2001
From: stojce <stojce@me.com>
Date: Thu, 18 Sep 2014 07:34:14 +0200
Subject: [PATCH] Hide name for all avatars, including MyAvatar

---
 interface/src/avatar/Avatar.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index 73e937116e..11537294ea 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -1027,6 +1027,11 @@ float Avatar::getPelvisToHeadLength() const {
 }
 
 void Avatar::setShowDisplayName(bool showDisplayName) {
+    if (!Menu::getInstance()->isOptionChecked(MenuOption::NamesAboveHeads)) {
+        _displayNameAlpha = 0.0f;
+        return;
+    }
+    
     // For myAvatar, the alpha update is not done (called in simulate for other avatars)
     if (Application::getInstance()->getAvatar() == this) {
         if (showDisplayName) {
@@ -1036,7 +1041,7 @@ void Avatar::setShowDisplayName(bool showDisplayName) {
         }
     } 
 
-    if (showDisplayName && Menu::getInstance()->isOptionChecked(MenuOption::NamesAboveHeads)) {
+    if (showDisplayName) {
         _displayNameTargetAlpha = DISPLAYNAME_ALPHA;
     } else {
         _displayNameTargetAlpha = 0.0f;