From 038f1acf0106f727643306f39406ef18ec4775f5 Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Tue, 25 Feb 2014 15:34:16 -0800
Subject: [PATCH] Don't render the hover text in mirror/billboard mode.  Closes
 #2098.

---
 interface/src/avatar/AvatarManager.cpp | 2 +-
 interface/src/avatar/MyAvatar.cpp      | 7 +++++--
 interface/src/avatar/MyAvatar.h        | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp
index fed6716ffa..847baf782f 100644
--- a/interface/src/avatar/AvatarManager.cpp
+++ b/interface/src/avatar/AvatarManager.cpp
@@ -92,7 +92,7 @@ void AvatarManager::renderAvatars(bool forceRenderMyHead, bool selfAvatarOnly) {
         renderAvatarFades();
     } else {
         // just render myAvatar
-        _myAvatar->render(forceRenderMyHead);
+        _myAvatar->render(forceRenderMyHead, true);
         _myAvatar->setDisplayingLookatVectors(renderLookAtVectors);
     }
 }
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 2e4309ac18..7b22201bfb 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -452,7 +452,7 @@ void MyAvatar::renderDebugBodyPoints() {
 
 
 }
-void MyAvatar::render(bool forceRenderHead) {
+void MyAvatar::render(bool forceRenderHead, bool avatarOnly) {
     // don't render if we've been asked to disable local rendering
     if (!_shouldRender) {
         return; // exit early
@@ -468,7 +468,10 @@ void MyAvatar::render(bool forceRenderHead) {
     if (Menu::getInstance()->isOptionChecked(MenuOption::Avatars)) {
         renderBody(forceRenderHead);
     }
-    setShowDisplayName(true);
+    setShowDisplayName(!avatarOnly);
+    if (avatarOnly) {
+        return;
+    }
     renderDisplayName();
 
     if (!_chatMessage.empty()) {
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index c1c217136d..aeb9e6d968 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -35,7 +35,7 @@ public:
     void simulate(float deltaTime);
     void updateFromGyros(float deltaTime);
 
-    void render(bool forceRenderHead);
+    void render(bool forceRenderHead, bool avatarOnly = false);
     void renderDebugBodyPoints();
     void renderHeadMouse() const;