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

CHUI-983 FIXED Call showHistory() after clicking toast as it was before. Minor change in showHistory()

master
Mnikolenko ProductEngine 2013-06-26 19:23:00 +03:00
parent bc329098a7
commit 9da29e2ccc
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llchatitemscontainerctrl.cpp
View File

@ -323,12 +323,11 @@ BOOL LLFloaterIMNearbyChatToastPanel::handleMouseUp (S32 x, S32 y, MASK mask)
return TRUE;
else
{
LLFloaterReg::toggleInstanceOrBringToFront("nearby_chat");
LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat")->showHistory();
return FALSE;
}
}
LLFloaterReg::toggleInstanceOrBringToFront("nearby_chat");
LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat")->showHistory();
return LLPanel::handleMouseUp(x,y,mask);
}

6
indra/newview/llfloaterimnearbychat.cpp
View File

@ -350,11 +350,17 @@ bool LLFloaterIMNearbyChat::isChatVisible() const
void LLFloaterIMNearbyChat::showHistory()
{
openFloater();
LLFloaterIMContainer::getInstance()->selectConversation(LLUUID(NULL));
if(!isMessagePaneExpanded())
{
restoreFloater();
setFocus(true);
}
else
{
LLFloaterIMContainer::getInstance()->setFocus(TRUE);
}
setResizeLimits(getMinWidth(), EXPANDED_MIN_HEIGHT);
}