summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Kondrashev <ekondrashev@productengine.com>2009-10-29 19:20:17 +0200
committerEugene Kondrashev <ekondrashev@productengine.com>2009-10-29 19:20:17 +0200
commit7d8c41b15076666f47470b28b1e7e7b63c064415 (patch)
treece17de5e56eecca28ca7244bc614a8863d4a9fe6
parent7d64c6a226046d962bf5cd2b1e53df6fe33a730d (diff)
Fixed normal bug EXT-1935-[BSI] Reversion - clicking on avatar name in group chat should bring up profile
--HG-- branch : product-engine
-rw-r--r--indra/newview/llchathistory.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index a66196a2cb..e561507e69 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -43,6 +43,7 @@
#include "llagentdata.h"
#include "llavataractions.h"
#include "lltrans.h"
+#include "llfloaterreg.h"
#include "llmutelist.h"
static LLDefaultChildRegistry::Register<LLChatHistory> r("chat_history");
@@ -131,7 +132,8 @@ public:
menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_object_icon.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
mPopupMenuHandleObject = menu->getHandle();
-
+ LLPanel* visible_panel = getChild<LLPanel>("im_header");
+ visible_panel->setMouseDownCallback(boost::bind(&LLChatHistoryHeader::onHeaderPanelClick, this, _2, _3, _4));
return LLPanel::postBuild();
}
@@ -164,6 +166,12 @@ public:
return LLPanel::handleRightMouseDown(x,y,mask);
}
+
+ void onHeaderPanelClick(S32 x, S32 y, MASK mask)
+ {
+ LLFloaterReg::showInstance("inspect_avatar", LLSD().insert("avatar_id", mAvatarID));
+ }
+
const LLUUID& getAvatarId () const { return mAvatarID;}
const std::string& getFirstName() const { return mFirstName; }
const std::string& getLastName () const { return mLastName; }