Merge from viewer2 trunk.

1 files changed, 44 insertions, 7 deletions

diff --git a/indra/newview/lltoastimpanel.cpp b/indra/newview/lltoastimpanel.cpp
index d62017cc2f..89a58cd736 100644
--- a/indra/newview/lltoastimpanel.cpp
+++ b/indra/newview/lltoastimpanel.cpp
@@ -33,22 +33,25 @@
 #include "llviewerprecompiledheaders.h"
 #include "lltoastimpanel.h"
 
+#include "llfloaterreg.h"
 #include "llnotifications.h"
 #include "llinstantmessage.h"
+#include "lltooltip.h"
+
 #include "llviewerchat.h"
 
 const S32 LLToastIMPanel::DEFAULT_MESSAGE_MAX_LINE_COUNT	= 6;
 
 //--------------------------------------------------------------------------
 LLToastIMPanel::LLToastIMPanel(LLToastIMPanel::Params &p) :	LLToastPanel(p.notification),
-								mAvatar(NULL), mUserName(NULL),
+								mAvatarIcon(NULL), mAvatarName(NULL),
 								mTime(NULL), mMessage(NULL)
 {
 	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_instant_message.xml");
 
 	LLIconCtrl* sys_msg_icon = getChild<LLIconCtrl>("sys_msg_icon");
-	mAvatar = getChild<LLAvatarIconCtrl>("avatar_icon");
-	mUserName = getChild<LLTextBox>("user_name");
+	mAvatarIcon = getChild<LLAvatarIconCtrl>("avatar_icon");
+	mAvatarName = getChild<LLTextBox>("user_name");
 	mTime = getChild<LLTextBox>("time_box");
 	mMessage = getChild<LLTextBox>("message");
 
@@ -77,22 +80,23 @@ LLToastIMPanel::LLToastIMPanel(LLToastIMPanel::Params &p) :	LLToastPanel(p.notif
 		mMessage->setValue(p.message);
 	}
 
-	mUserName->setValue(p.from);
+	mAvatarName->setValue(p.from);
 	mTime->setValue(p.time);
 	mSessionID = p.session_id;
+	mAvatarID = p.avatar_id;
 	mNotification = p.notification;
 
 	if(p.from == SYSTEM_FROM)
 	{
-		mAvatar->setVisible(FALSE);
+		mAvatarIcon->setVisible(FALSE);
 		sys_msg_icon->setVisible(TRUE);
 	}
 	else
 	{
-		mAvatar->setVisible(TRUE);
+		mAvatarIcon->setVisible(TRUE);
 		sys_msg_icon->setVisible(FALSE);
 
-		mAvatar->setValue(p.avatar_id);
+		mAvatarIcon->setValue(p.avatar_id);
 	}
 
 	S32 maxLinesCount;
@@ -119,3 +123,36 @@ BOOL LLToastIMPanel::handleMouseDown(S32 x, S32 y, MASK mask)
 
 	return TRUE;
 }
+
+//virtual
+BOOL LLToastIMPanel::handleToolTip(S32 x, S32 y, MASK mask)
+{
+	// It's not our direct child, so parentPointInView() doesn't work.
+	LLRect name_rect;
+	mAvatarName->localRectToOtherView(mAvatarName->getLocalRect(), &name_rect, this);
+	if (!name_rect.pointInRect(x, y))
+		return LLToastPanel::handleToolTip(x, y, mask);
+
+	// Spawn at right side of the name textbox.
+	LLRect sticky_rect = mAvatarName->calcScreenRect();
+	S32 icon_x = llmin(sticky_rect.mLeft + mAvatarName->getTextPixelWidth() + 3, sticky_rect.mRight - 16);
+	LLCoordGL pos(icon_x, sticky_rect.mTop);
+
+	LLToolTip::Params params;
+	params.background_visible(false);
+	params.click_callback(boost::bind(&LLToastIMPanel::showInspector, this));
+	params.delay_time(0.0f);		// spawn instantly on hover
+	params.image(LLUI::getUIImage("Info_Small"));
+	params.message("");
+	params.padding(0);
+	params.pos(pos);
+	params.sticky_rect(sticky_rect);
+
+	LLToolTipMgr::getInstance()->show(params);
+	return TRUE;
+}
+
+void LLToastIMPanel::showInspector()
+{
+	LLFloaterReg::showInstance("inspect_avatar", LLSD().with("avatar_id", mAvatarID));
+}