From 9a523a60cfefa58a488ec88e3487232c8b5ec0c0 Mon Sep 17 00:00:00 2001
From: stojce <stojce@me.com>
Date: Thu, 18 Sep 2014 06:59:29 +0200
Subject: [PATCH 1/2] Add option to toggle on/off names above heads

---
 interface/src/Menu.cpp          | 1 +
 interface/src/Menu.h            | 1 +
 interface/src/avatar/Avatar.cpp | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index d3d1c8c0d0..c59727045d 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -269,6 +269,7 @@ Menu::Menu() :
 
     QObject* avatar = appInstance->getAvatar();
     addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::ChatCircling, 0, false);
+    addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::NamesAboveHeads, 0, true);
     addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::GlowWhenSpeaking, 0, true);
     addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::BlueSpeechSphere, 0, true);
     addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::ObeyEnvironmentalGravity, Qt::SHIFT | Qt::Key_G, false,
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index b43e7cb75e..9bc9fd2204 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -395,6 +395,7 @@ namespace MenuOption {
     const QString FullscreenMirror = "Fullscreen Mirror";
     const QString GlowMode = "Cycle Glow Mode";
     const QString GlowWhenSpeaking = "Glow When Speaking";
+    const QString NamesAboveHeads = "Names Above Heads";
     const QString GoToUser = "Go To User";
     const QString HeadMouse = "Head Mouse";
     const QString IncreaseAvatarSize = "Increase Avatar Size";
diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index b62c744fa2..73e937116e 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -1036,7 +1036,7 @@ void Avatar::setShowDisplayName(bool showDisplayName) {
         }
     } 
 
-    if (showDisplayName) {
+    if (showDisplayName && Menu::getInstance()->isOptionChecked(MenuOption::NamesAboveHeads)) {
         _displayNameTargetAlpha = DISPLAYNAME_ALPHA;
     } else {
         _displayNameTargetAlpha = 0.0f;

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 2/2] 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;