diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp
index d0f4d19f561df37d2d66d974904ccfe76be399b7..6537c19900c9192ffe07ed6c4e66a97a645d6f23 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 7f568fc5b89314f1e9798e44fc2794cff7942b89..abb0f545dc39f5a6616df0f14f1f77402c701199 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