livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed EXT-4953 'i' near resident name in the IM toast opens group inspector 

--HG--
branch : product-engine
master
Igor Borovkov 2010-02-10 17:27:39 +02:00
parent a138401963
commit 87ec59bf4d
1 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
indra/newview/lltoastimpanel.cpp
View File

@ -141,32 +141,6 @@ BOOL LLToastIMPanel::handleToolTip(S32 x, S32 y, MASK mask)
return LLToastPanel::handleToolTip(x, y, mask);
}
void LLToastIMPanel::showInspector()
{
LLIMModel::LLIMSession* im_session = LLIMModel::getInstance()->findIMSession(mSessionID);
if(!im_session)
{
llwarns << "Invalid IM session" << llendl;
return;
}
switch(im_session->mSessionType)
{
case LLIMModel::LLIMSession::P2P_SESSION:
LLFloaterReg::showInstance("inspect_avatar", LLSD().with("avatar_id", mAvatarID));
break;
case LLIMModel::LLIMSession::GROUP_SESSION:
LLFloaterReg::showInstance("inspect_group", LLSD().with("group_id", mSessionID));
break;
case LLIMModel::LLIMSession::ADHOC_SESSION:
LLFloaterReg::showInstance("inspect_avatar", LLSD().with("avatar_id", im_session->mOtherParticipantID));
break;
default:
llwarns << "Unknown IM session type" << llendl;
break;
}
}
void LLToastIMPanel::spawnNameToolTip()
{
// Spawn at right side of the name textbox.
@ -176,7 +150,7 @@ void LLToastIMPanel::spawnNameToolTip()
LLToolTip::Params params;
params.background_visible(false);
params.click_callback(boost::bind(&LLToastIMPanel::showInspector, this));
params.click_callback(boost::bind(&LLFloaterReg::showInstance, "inspect_avatar", LLSD().with("avatar_id", mAvatarID), FALSE));
params.delay_time(0.0f); // spawn instantly on hover
params.image(LLUI::getUIImage("Info_Small"));
params.message("");
@ -201,7 +175,7 @@ void LLToastIMPanel::spawnGroupIconToolTip()
LLInspector::Params params;
params.fillFrom(LLUICtrlFactory::instance().getDefaultParams<LLInspector>());
params.click_callback(boost::bind(&LLToastIMPanel::showInspector, this));
params.click_callback(boost::bind(&LLFloaterReg::showInstance, "inspect_group", LLSD().with("group_id", mSessionID), FALSE));
params.delay_time(0.100f);
params.image(LLUI::getUIImage("Info_Small"));
params.message(g_data.mName);