From 775f6421ad5fce2d67940a03a71863cc7fa75598 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Mon, 1 Nov 2010 15:34:32 +0100
Subject: [PATCH] - fixed : don't show a tooltip for the avatar icon control if
it's set not to show tooltips -> vanilla SL "bug"/UI idiosyncrasy
--HG--
branch : RLVa
---
indra/newview/llavatariconctrl.cpp | 10 ++++++++++
indra/newview/llavatariconctrl.h | 4 ++++
2 files changed, 14 insertions(+)
diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp
index d0f4d19f561..6537c19900c 100644
--- a/indra/newview/llavatariconctrl.cpp
+++ b/indra/newview/llavatariconctrl.cpp
@@ -306,3 +306,13 @@ void LLAvatarIconCtrl::onAvatarNameCache(const LLUUID& agent_id, const LLAvatarN
}
}
}
+
+// [SL:KB] - Checked: 2010-11-01 (RLVa-1.2.2a) | Added: RLVa-1.2.2a
+BOOL LLAvatarIconCtrl::handleToolTip(S32 x, S32 y, MASK mask)
+{
+ // Don't show our tooltip if we were asked not to
+ if (!mDrawTooltip)
+ return FALSE;
+ return LLIconCtrl::handleToolTip(x, y, mask);
+}
+// [/SL:KB]
diff --git a/indra/newview/llavatariconctrl.h b/indra/newview/llavatariconctrl.h
index 7f568fc5b89..abb0f545dc3 100644
--- a/indra/newview/llavatariconctrl.h
+++ b/indra/newview/llavatariconctrl.h
@@ -81,6 +81,10 @@ class LLAvatarIconCtrl
public:
virtual ~LLAvatarIconCtrl();
+// [SL:KB] - Checked: 2010-11-01 (RLVa-1.2.2a) | Added: RLVa-1.2.2a
+ /*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask);
+// [/SL:KB]
+
virtual void setValue(const LLSD& value);
// LLAvatarPropertiesProcessor observer trigger
--
GitLab